152 files changed, 4032 insertions, 2804 deletions
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 54687b1..e9cd858 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.15.0.2";
+CFBundleShortVersionString = "Second Life version 1.15.1.3";
-CFBundleGetInfoString = "Second Life version 1.15.0.2, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleGetInfoString = "Second Life version 1.15.1.3, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index 0908e18..108f716 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.15.0.2</string>
+        <string>1.15.1.3</string>
        <key>CSResourcesFileMapped</key>
        <true/>
 </dict>
diff --git a/linden/indra/newview/app_settings/keys.ini b/linden/indra/newview/app_settings/keys.ini
index b7fc6f9..3a1e9ea 100644
--- a/linden/indra/newview/app_settings/keys.ini
+++ b/linden/indra/newview/app_settings/keys.ini
@@ -235,6 +235,13 @@ EDIT			PAD_PGUP	ALT			jump
 EDIT                    PAD_PGDN        ALT                     push_down
 EDIT                    PAD_ENTER       ALT                     start_chat
+SITTING                 A       ALT                     spin_around_cw
+SITTING                 D       ALT                     spin_around_ccw
+SITTING                 W       ALT                     move_forward
+SITTING                 S       ALT                     move_backward
+SITTING                 E       ALT                     spin_over_sitting
+SITTING                 C       ALT                     spin_under_sitting
 SITTING                 LEFT    ALT                     spin_around_cw
 SITTING                 RIGHT   ALT                     spin_around_ccw
 SITTING                 UP              ALT                     move_forward
@@ -242,6 +249,21 @@ SITTING			DOWN	ALT			move_backward
 SITTING                 PGUP    ALT                     spin_over
 SITTING                 PGDN    ALT                     spin_under
+SITTING                 A       CTL_ALT                 spin_around_cw
+SITTING                 D       CTL_ALT                 spin_around_ccw
+SITTING                 W       CTL_ALT                 spin_over
+SITTING                 S       CTL_ALT                 spin_under
+SITTING                 E       CTL_ALT                 spin_over
+SITTING                 C       CTL_ALT                 spin_under
+SITTING                 LEFT    CTL_ALT                 spin_around_cw
+SITTING                 RIGHT   CTL_ALT                 spin_around_ccw
+SITTING                 UP              CTL_ALT                 spin_over
+SITTING                 DOWN    CTL_ALT                 spin_under
+SITTING                 PGUP    CTL_ALT                 spin_over
+SITTING                 PGDN    CTL_ALT                 spin_under
 SITTING                 A               NONE            spin_around_cw_sitting
 SITTING                 D               NONE            spin_around_ccw_sitting
 SITTING                 W               NONE            move_forward_sitting
diff --git a/linden/indra/newview/featuretable_linux.txt b/linden/indra/newview/featuretable_linux.txt
new file mode 100644
index 0000000..6c7acfa
--- /dev/null
+++ b/linden/indra/newview/featuretable_linux.txt
@@ -0,0 +1,173 @@
+version 10
+// NOTE: This is mostly identical to featuretable.txt with a few differences
+// Should be combined into one table
+//
+// Generates lists of feature mask that can be applied on top of each other.
+//
+//              //              Begin comments
+//              list <name>
+//              Starts a feature list named <name>
+//              <name> <available> <recommended>
+//              <name> is the name of a feature
+//              <available> is 0 or 1, whether the feature is available
+//              <recommended> is an S32 which is the recommended value
+//
+// For now, the first list read sets up all of the default values
+//
+//
+// All contains everything at their default settings for high end machines
+// NOTE: All settings are set to the MIN of applied values, including 'all'!
+//
+list all
+RenderVBO                       1       1
+RenderAniso                     1       0
+RenderAvatarMode        1       2
+RenderAvatarVP          1       1
+RenderDistance          1       128
+RenderLighting          1       1
+RenderObjectBump        1       1
+RenderParticleCount     1       4096
+RenderRippleWater       1       1
+RenderTerrainDetail     1       2
+VertexShaderEnable      1       1
+//
+// Class 0 Hardware (Unknown or just old)
+//
+list Class0
+VertexShaderEnable      1       0
+RenderVBO                       1       0
+RenderDistance          1       64
+RenderAvatarVP          1       0
+RenderAvatarMode        1       0
+RenderLighting          1       0
+RenderObjectBump        1       0
+RenderRippleWater       1       0
+//
+// Class 1 Hardware
+//
+list Class1
+VertexShaderEnable      1       0
+RenderVBO                       1       1
+RenderDistance          1       96
+RenderAvatarVP          1       1
+RenderAvatarMode        1       0
+RenderLighting          1       0
+RenderObjectBump        1       0
+RenderRippleWater       1       0
+//
+// Class 2 Hardware (make it purty)
+//
+list Class2
+VertexShaderEnable      1       1
+RenderAvatarVP          1       1
+RenderAvatarMode        1       1
+RenderLighting          1       1
+RenderObjectBump        1       1
+RenderRippleWater       1       1
+//
+// Class 3 Hardware (make it purty)
+//
+list Class3
+VertexShaderEnable      1       1
+RenderAvatarVP          1       1
+RenderAvatarMode        1       1
+RenderLighting          1       1
+RenderObjectBump        1       1
+RenderRippleWater       1       1
+//
+// No Pixel Shaders available
+//
+list NoPixelShaders
+VertexShaderEnable      0       0
+RenderAvatarVP          0  0
+//
+// No Vertex Shaders available
+//
+list NoVertexShaders
+VertexShaderEnable      0       0
+RenderAvatarVP          0  0
+//
+// "Default" setups for safe, low, medium, high
+//
+list safe
+RenderVBO                       1       0
+RenderAniso                     1       0
+RenderAvatarVP          0       0
+RenderLighting          1       0
+RenderParticleCount     1       1024
+RenderTerrainDetail 1   0
+list low
+RenderVBO                       1       0
+RenderAniso                     1       0
+RenderLighting          1       0
+list medium
+RenderLighting          1       0
+//
+// CPU based feature masks
+//
+// 1Ghz or less (equiv)
+list CPUSlow
+RenderParticleCount     1       1024
+//
+// RAM based feature masks
+//
+list RAM256MB
+RenderObjectBump        0       0
+//
+// Graphics card based feature masks
+//
+list OpenGLPre15
+RenderVBO                       1       0
+list Intel
+RenderVBO                       1       0
+RenderAniso                     1       0
+RenderLighting          1       0
+RenderTerrainDetail     1       0
+list GeForce2
+RenderVBO                       1       1
+RenderAniso                     1       0
+RenderLighting          1       0
+RenderParticleCount     1       2048
+RenderTerrainDetail     1       0
+list GeForce3
+list ATI
+list Radeon8500
+RenderLighting          1       0
+RenderParticleCount     1       4096
+// Hacked to be paranoid "safe"
+list Radeon9700
+RenderParticleCount     1       4096
+// Hacked to be paranoid "safe"
+list MobilityRadeon9000
+RenderLighting          1       0
+RenderParticleCount     1       4096
+list GeForceFX
diff --git a/linden/indra/newview/files.lst b/linden/indra/newview/files.lst
index 8fdd239..2967bed 100644
--- a/linden/indra/newview/files.lst
+++ b/linden/indra/newview/files.lst
@@ -282,6 +282,7 @@ newview/llviewerjoystick.cpp
 newview/llviewerkeyboard.cpp
 newview/llviewerlayer.cpp
 newview/llviewermenu.cpp
+newview/llviewermenufile.cpp
 newview/llviewermessage.cpp
 newview/llviewernetwork.cpp
 newview/llviewerobject.cpp
diff --git a/linden/indra/newview/gpu_table.txt b/linden/indra/newview/gpu_table.txt
index 4e6373d..a6d1dee 100644
--- a/linden/indra/newview/gpu_table.txt
+++ b/linden/indra/newview/gpu_table.txt
@@ -22,11 +22,9 @@ ATI All-in-Wonder X1800			.*ATI.*All-in-Wonder X18.*				3
 ATI All-in-Wonder X1900                 .*ATI.*All-in-Wonder X19.*                              3
 ATI ASUS X1xxx                                  .*ASUS X1.*                                                             3
 ATI Mobility Radeon X1xxx               .*ATI.*Mobility.*X1.*                                   2
-// HACK: We crash on startup on some Mobility Radeon chips, with 1.15.0
+ATI Mobility Radeon X3xx                .*ATI.*Mobility.*X3.*                                   1
-// in FMOD (!).  Try defaulting them to class 0. JC
+ATI Mobility Radeon X6xx                .*ATI.*Mobility.*X6.*                                   1
-ATI Mobility Radeon X3xx                .*ATI.*Mobility.*X3.*                                   0
+ATI Mobility Radeon X7xx                .*ATI.*Mobility.*X7.*                                   1
-ATI Mobility Radeon X6xx                .*ATI.*Mobility.*X6.*                                   0
-ATI Mobility Radeon X7xx                .*ATI.*Mobility.*X7.*                                   0
 ATI Radeon OpenGL                               .*ATI.*Radeon OpenGL.*                                  3
 ATI Diamond X1xxx                               .*ATI.*Diamond.*X1.*                                    3
 ATI FireGL 5xxx                                 .*ATI.*FireGL V5.*                                              3
diff --git a/linden/indra/newview/linux_tools/client-readme.txt b/linden/indra/newview/linux_tools/client-readme.txt
index cabb034..63086c8 100644
--- a/linden/indra/newview/linux_tools/client-readme.txt
+++ b/linden/indra/newview/linux_tools/client-readme.txt
@@ -97,7 +97,6 @@ the Alpha release of the Linux client.
  implemented on the Linux client and are therefore known not to work properly
  at this time:
  * QuickTime movie playback and movie recording
-  * Video memory detection
  * Full Unicode font rendering
  * Auto-updater
diff --git a/linden/indra/newview/linux_tools/launch_url.sh b/linden/indra/newview/linux_tools/launch_url.sh
index 564e834..a1c6f5d 100755
--- a/linden/indra/newview/linux_tools/launch_url.sh
+++ b/linden/indra/newview/linux_tools/launch_url.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# bash v1.14+ expected
+# Script tested with: bash 1.14, bash 3.1.17, zsh 4.2.5, ksh 1993-12-28
 # This script loads a web page in the 'default' graphical web browser.
 # It MUST return immediately (or soon), so the browser should be
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index cdc36a8..5f128e8 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Script tested with: bash 1.14, bash 3.1.17, zsh 4.2.5, ksh 1993-12-28
 ## Here are some configuration options for Linux Client Alpha Testers.
 ## These options are for self-assisted troubleshooting during this alpha
 ## testing phase; you should not usually need to touch them.
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index ff16682..85c268b 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -7081,7 +7081,7 @@ void LLAgent::queryWearableCache()
        // Look up affected baked textures.
        // If they exist:
        //              disallow updates for affected layersets (until dataserver responds with cache request.)
-        //              If cache miss�turn updates back on and invalidate composite.
+        //              If cache miss, turn updates back on and invalidate composite.
        //              If cache hit, modify baked texture entries.
        //
        // Cache requests contain list of hashes for each baked texture entry.
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index 821bb2a..26c606f 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -21,7 +21,7 @@
 #include "lluploaddialog.h"
 #include "llviewerobject.h"
 #include "llviewerobjectlist.h"
-#include "llviewermenu.h"
+#include "llviewermenufile.h"
 #include "llviewerwindow.h"
 #include "viewer.h"
diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp
index 22e7f23..3e00f40 100644
--- a/linden/indra/newview/llcallingcard.cpp
+++ b/linden/indra/newview/llcallingcard.cpp
@@ -269,12 +269,28 @@ S32 LLAvatarTracker::addBuddyList(const LLAvatarTracker::buddy_map_t& buds)
        for(buddy_map_t::const_iterator itr = buds.begin(); itr != buds.end(); ++itr)
        {
                agent_id = (*itr).first;
-                if(mBuddyInfo.find(agent_id) == mBuddyInfo.end())
+                buddy_map_t::const_iterator existing_buddy = mBuddyInfo.find(agent_id);
+                if(existing_buddy == mBuddyInfo.end())
                {
                        ++new_buddy_count;
                        mBuddyInfo[agent_id] = (*itr).second;
                        gCacheName->getName(agent_id, first, last);
                        mModifyMask |= LLFriendObserver::ADD;
+                        lldebugs << "Added buddy " << agent_id
+                                        << ", " << (mBuddyInfo[agent_id]->isOnline() ? "Online" : "Offline")
+                                        << ", TO: " << mBuddyInfo[agent_id]->getRightsGrantedTo()
+                                        << ", FROM: " << mBuddyInfo[agent_id]->getRightsGrantedFrom()
+                                        << llendl;
+                }
+                else
+                {
+                        LLRelationship* e_r = (*existing_buddy).second;
+                        LLRelationship* n_r = (*itr).second;
+                        llwarns << "!! Add buddy for existing buddy: " << agent_id
+                                        << " [" << (e_r->isOnline() ? "Online" : "Offline") << "->" << (n_r->isOnline() ? "Online" : "Offline")
+                                        << ", " <<  e_r->getRightsGrantedTo() << "->" << n_r->getRightsGrantedTo()
+                                        << ", " <<  e_r->getRightsGrantedTo() << "->" << n_r->getRightsGrantedTo()
+                                        << "]" << llendl;
                }
        }
        
@@ -325,6 +341,12 @@ void LLAvatarTracker::setBuddyOnline(const LLUUID& id, bool is_online)
        {
                info->online(is_online);
                mModifyMask |= LLFriendObserver::ONLINE;
+                lldebugs << "Set buddy " << id << (is_online ? " Online" : " Offline") << llendl;
+        }
+        else
+        {
+                llwarns << "!! No buddy info found for " << id 
+                                << ", setting to " << (is_online ? "Online" : "Offline") << llendl;
        }
 }
@@ -598,6 +620,7 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
        S32 count = msg->getNumberOfBlocksFast(_PREHASH_AgentBlock);
        BOOL chat_notify = gSavedSettings.getBOOL("ChatOnlineNotification");
+        lldebugs << "Received " << count << " online notifications **** " << llendl;
        if(count > 0)
        {
                LLUUID agent_id;
@@ -628,6 +651,12 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
                                        }
                                }
                        }
+                        else
+                        {
+                                llwarns << "Received online notification for unknown buddy: " 
+                                        << agent_id << " is " << (online ? "ONLINE" : "OFFLINE") << llendl;
+                        }
                        if(tracking_id == agent_id)
                        {
                                // we were tracking someone who went offline
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 02bed33..a6feac7 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -118,9 +118,10 @@ LLChatBar::LLChatBar(const std::string& name, const LLRect& rect)
                mInputEditor->setRevertOnEsc( FALSE );
                mInputEditor->setIgnoreTab(TRUE);
                mInputEditor->setPassDelete(TRUE);
+                mInputEditor->setMaxTextLength(1023);
        }
-        mInputEditor->setMaxTextLength(1023);
        // Build the list of gestures
        refreshGestures();
diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp
index 7989791..11b97b4 100644
--- a/linden/indra/newview/llcontroldef.cpp
+++ b/linden/indra/newview/llcontroldef.cpp
@@ -573,7 +573,7 @@ void declare_settings()
        gSavedSettings.declareBOOL("ShowAxes", FALSE, "Render coordinate frame at your position");
-        gSavedSettings.declareBOOL("ShowMiniMap", FALSE, "Display mini map on login");
+        gSavedSettings.declareBOOL("ShowMiniMap", TRUE, "Display mini map on login");
        gSavedSettings.declareBOOL("ShowWorldMap", FALSE, "Display world map on login");
        gSavedSettings.declareBOOL("ShowToolBar", TRUE, "Show toolbar at bottom of screen");
        gSavedSettings.declareBOOL("ShowCameraControls", FALSE, "Display camera controls on login");
@@ -833,7 +833,7 @@ void declare_settings()
        // Previews - only width and height are used
        gSavedSettings.declareRect("PreviewTextureRect",                        LLRect(0, 400, 400, 0), "Rectangle for texture preview window" );  // Only width and height are used
        gSavedSettings.declareRect("PreviewScriptRect",                         LLRect(0, 550, 500, 0), "Rectangle for script preview window" );  // Only width and height are used
-        gSavedSettings.declareRect("LSLHelpRect",                                       LLRect(0, 500, 600, 0), "Rectangle for LSL help window" );  // Only width and height are used
+        gSavedSettings.declareRect("LSLHelpRect",                                       LLRect(0, 400, 400, 0), "Rectangle for LSL help window" );  // Only width and height are used
        gSavedSettings.declareRect("PreviewLandmarkRect",                       LLRect(0,  90, 300, 0), "Rectangle for landmark preview window" );  // Only width and height are used
        gSavedSettings.declareRect("PreviewSoundRect",                          LLRect(0,  85, 300, 0), "Rectangle for sound preview window" );  // Only width and height are used
        gSavedSettings.declareRect("PreviewObjectRect",                         LLRect(0,  85, 300, 0), "Rectangle for object preview window" );  // Only width and height are used
@@ -1145,15 +1145,18 @@ void declare_settings()
        gSavedSettings.declareBOOL("NotifyMoneyChange", TRUE, "Pop up notifications for all financial transactions");
+        gSavedSettings.declareBOOL("ShowNewInventory", TRUE,
+                "Automatic Previews of new notecards/textures/landmarks");
        // Bitfield
        // 1 = by date
        // 2 = folders always by name
+        // 4 = system folders to top
        // This where the default first time user gets his settings.
-        gSavedSettings.declareU32("InventorySortOrder", 1 | 2, "Specifies sort key for inventory items (+0 = name, +1 = date, +2 = folders always by name)");
+        gSavedSettings.declareU32("InventorySortOrder", 1 | 2 | 4, "Specifies sort key for inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)");
-        gSavedSettings.declareU32("RecentItemsSortOrder", 1, "Specifies sort key for recent inventory items (+0 = name, +1 = date, +2 = folders always by name)");
+        gSavedSettings.declareU32("RecentItemsSortOrder", 1, "Specifies sort key for recent inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)");
-        gSavedSettings.declareU32("TexturePickerSortOrder", 2, "Specifies sort key for textures in texture picker (+0 = name, +1 = date, +2 = folders always by name)");
+        gSavedSettings.declareU32("TexturePickerSortOrder", 2, "Specifies sort key for textures in texture picker (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)");
-        gSavedSettings.declareU32("AvatarPickerSortOrder", 2, "Specifies sort key for textures in avatar picker (+0 = name, +1 = date, +2 = folders always by name)");
+        gSavedSettings.declareU32("AvatarPickerSortOrder", 2, "Specifies sort key for textures in avatar picker (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)");
        // Pixels away from edge that windows snap.
        gSavedSettings.declareS32("SnapMargin", 10, "Controls maximum distance between windows before they auto-snap together (pixels)");
diff --git a/linden/indra/newview/lldebugmessagebox.cpp b/linden/indra/newview/lldebugmessagebox.cpp
index af500da..e238800 100644
--- a/linden/indra/newview/lldebugmessagebox.cpp
+++ b/linden/indra/newview/lldebugmessagebox.cpp
@@ -225,21 +225,21 @@ void LLDebugVarMessageBox::draw()
        if(mAnimate)
        {
-                F32 animated_val = clamp_rescale(fmodf((F32)LLFrameTimer::getElapsedSeconds() / 5.f, 1.f), 0.f, 1.f, 0.f, mSlider1->getMaxValue());
                if (mSlider1)
                {
+                        F32 animated_val = clamp_rescale(fmodf((F32)LLFrameTimer::getElapsedSeconds() / 5.f, 1.f), 0.f, 1.f, 0.f, mSlider1->getMaxValue());
                        mSlider1->setValue(animated_val);
                        slider_changed(mSlider1, this);
-                }
+                        if (mSlider2)
-                if (mSlider2)
+                        {
-                {
+                                mSlider2->setValue(animated_val);
-                        mSlider2->setValue(animated_val);
+                                slider_changed(mSlider2, this);
-                        slider_changed(mSlider2, this);
+                        }
-                }
+                        if (mSlider3)
-                if (mSlider3)
+                        {
-                {
+                                mSlider3->setValue(animated_val);
-                        mSlider3->setValue(animated_val);
+                                slider_changed(mSlider3, this);
-                        slider_changed(mSlider3, this);
+                        }
                }
        }
        LLFloater::draw();
diff --git a/linden/indra/newview/lldrawpoolavatar.cpp b/linden/indra/newview/lldrawpoolavatar.cpp
index debcfe2..b864449 100644
--- a/linden/indra/newview/lldrawpoolavatar.cpp
+++ b/linden/indra/newview/lldrawpoolavatar.cpp
@@ -102,7 +102,8 @@ BOOL gRenderAvatar = TRUE;
 S32 LLDrawPoolAvatar::getVertexShaderLevel() const
 {
-        return (S32) LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_AVATAR);
+        return sShaderLevel;
+        //return (S32) LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_AVATAR);
 }
 void LLDrawPoolAvatar::prerender()
@@ -197,20 +198,22 @@ void LLDrawPoolAvatar::endFootShadow()
 void LLDrawPoolAvatar::beginRigid()
 {
-        sVertexProgram = &gAvatarEyeballProgram;
+        sVertexProgram = NULL;
+        sShaderLevel = 0;
        glEnableClientState(GL_NORMAL_ARRAY);
        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        if (sShaderLevel > 0)
+        /*if (sShaderLevel > 0)
        {       //eyeballs render with the specular shader
                gAvatarEyeballProgram.bind();
                gMaterialIndex = gAvatarEyeballProgram.mAttribute[LLShaderMgr::MATERIAL_COLOR];
                gSpecularIndex = gAvatarEyeballProgram.mAttribute[LLShaderMgr::SPECULAR_COLOR];
-        }
+        }*/
 }
 void LLDrawPoolAvatar::endRigid()
 {
+        sShaderLevel = mVertexShaderLevel;
        glDisableClientState(GL_NORMAL_ARRAY);
        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 }
diff --git a/linden/indra/newview/lldriverparam.cpp b/linden/indra/newview/lldriverparam.cpp
index ce42ad5..463888c 100644
--- a/linden/indra/newview/lldriverparam.cpp
+++ b/linden/indra/newview/lldriverparam.cpp
@@ -346,7 +346,7 @@ const LLVector3*	LLDriverParam::getNextDistortion(U32 *index, LLPolyMesh **poly_
        // We're already in the middle of a param's distortions, so get the next one.
        const LLVector3* v = driven->mParam->getNextDistortion( index, poly_mesh );
-        if( !v )
+        if( (!v) && (iter != mDriven.end()) )
        {
                // This param is finished, so start the next param.  It might not have any
                // distortions, though, so we have to loop to find the next param that does.
diff --git a/linden/indra/newview/lleventpoll.cpp b/linden/indra/newview/lleventpoll.cpp
index 9c5a19d..7430fc3 100644
--- a/linden/indra/newview/lleventpoll.cpp
+++ b/linden/indra/newview/lleventpoll.cpp
@@ -79,7 +79,7 @@ LLEventPoll::Impl& LLEventPoll::Impl::start(
 void LLEventPoll::Impl::stop()
 {
-        llinfos << "LLEventPoll::Impl::stop     <" << mCount << "> "
+        lldebugs        << "LLEventPoll::Impl::stop     <" << mCount << "> "
                        << mPollURL     << llendl;
        // there should be a way to     stop a LLHTTPClient     request in progress
        mDone = true;
diff --git a/linden/indra/newview/llfasttimerview.cpp b/linden/indra/newview/llfasttimerview.cpp
index c469d8c..c7be3aa 100644
--- a/linden/indra/newview/llfasttimerview.cpp
+++ b/linden/indra/newview/llfasttimerview.cpp
@@ -1108,6 +1108,15 @@ F64 LLFastTimerView::getTime(LLFastTimer::EFastTimerType tidx)
                        break;
                }
        }
+        if (i == FTV_DISPLAY_NUM)
+        {
+                // walked off the end of ft_display_table without finding
+                // the desired timer type
+                llwarns << "Timer type " << tidx << " not known." << llendl;
+                return F64(0.0);
+        }
        S32 table_idx = i;
        
        // Add child ticks to parent
diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index 57fbc64..2a30680 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -60,6 +60,8 @@ extern void write_debug(const std::string& str);
 #if LL_DARWIN
 const char FEATURE_TABLE_FILENAME[] = "featuretable_mac.txt";
+#elif LL_LINUX
+const char FEATURE_TABLE_FILENAME[] = "featuretable_linux.txt";
 #else
 const char FEATURE_TABLE_FILENAME[] = "featuretable.txt";
 #endif
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 971743b..24d3932 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -451,8 +451,9 @@ void LLFilePicker::reset()
 void LLFilePicker::buildFilename( void )
 {
-        strncpy( mFilename, mFiles, LL_MAX_PATH );      /*Flawfinder: ignore*/
+        strncpy( mFilename, mFiles, LL_MAX_PATH );
-        S32 len = strlen( mFilename );  /*Flawfinder: ignore*/
+        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*/
@@ -858,7 +859,10 @@ void LLFilePicker::getFilePath(SInt32 index)
 {
        mFiles[0] = 0;
        if (mFileVector.size())
-                strncpy(mFiles, mFileVector[index].c_str(), sizeof(mFiles));    /*Flawfinder: ignore*/  
+        {
+                strncpy(mFiles, mFileVector[index].c_str(), sizeof(mFiles));
+                mFiles[sizeof(mFiles)-1] = '\0'; // stupid strncpy
+        }
 }
 void LLFilePicker::getFileName(SInt32 index)
@@ -868,7 +872,10 @@ void LLFilePicker::getFileName(SInt32 index)
        {
                char    *start = strrchr(mFileVector[index].c_str(), '/');
                if (start && ((start + 1 - mFileVector[index].c_str()) < (mFileVector[index].size())))
-                        strncpy(mFilename, start + 1, sizeof(mFilename));               /*Flawfinder: ignore*/
+                {
+                        strncpy(mFilename, start + 1, sizeof(mFilename));
+                        mFilename[sizeof(mFilename)-1] = '\0';// stupid strncpy
+                }
        }
 }
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp
index 6802fb2..b1f8a53 100644
--- a/linden/indra/newview/llfloateranimpreview.cpp
+++ b/linden/indra/newview/llfloateranimpreview.cpp
@@ -54,7 +54,7 @@
 #include "llviewercamera.h"
 #include "llviewerobjectlist.h"
 #include "llviewerwindow.h"
-#include "llviewermenu.h"
+#include "llviewermenufile.h"   // upload_new_resource()
 #include "llvoavatar.h"
 #include "pipeline.h"
 #include "viewer.h"
@@ -221,7 +221,7 @@ BOOL LLFloaterAnimPreview::postBuild()
                        }
                        apr_file_close(fp);
-                        delete file_buffer;
+                        delete[] file_buffer;
                }
        }
@@ -247,11 +247,11 @@ BOOL LLFloaterAnimPreview::postBuild()
                // pass animation data through memory buffer
                loaderp->serialize(dp);
                dp.reset();
-                BOOL success = motionp->deserialize(dp);
+                BOOL success = motionp && motionp->deserialize(dp);
                delete []buffer;
-                if (motionp && success)
+                if (success)
                {
                        const LLBBoxLocal &pelvis_bbox = motionp->getPelvisBBox();
diff --git a/linden/indra/newview/llfloateravatarinfo.cpp b/linden/indra/newview/llfloateravatarinfo.cpp
index c0351ee..2245d31 100644
--- a/linden/indra/newview/llfloateravatarinfo.cpp
+++ b/linden/indra/newview/llfloateravatarinfo.cpp
@@ -195,7 +195,6 @@ void LLFloaterAvatarInfo::showFromDirectory(const LLUUID &avatar_id)
        {
                // ...bring that window to front
                floater = gAvatarInfoInstances.getData(avatar_id);
-                floater->open();                /*Flawfinder: ignore*/
        }
        else
        {
@@ -203,7 +202,10 @@ void LLFloaterAvatarInfo::showFromDirectory(const LLUUID &avatar_id)
                        avatar_id);
                floater->center();
                floater->mPanelAvatarp->setAvatarID(avatar_id, "", ONLINE_STATUS_NO);
-                floater->open();        /*Flawfinder: ignore*/
+        }
+        if(floater)
+        {
+                floater->open();
        }
 }
diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index 8d39890..d01a24b 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -287,6 +287,7 @@ void LLFloaterFriends::refreshRightsChangeList(U8 state)
        bool can_change_online_multiple = true;
        bool can_change_map_multiple = true;
        LLTextBox* processing_label = LLUICtrlFactory::getTextBoxByName(this, "process_rights_label");
        if(!mAllowRightsChange)
        {
                if(processing_label)
@@ -302,9 +303,10 @@ void LLFloaterFriends::refreshRightsChangeList(U8 state)
                        processing_label->setVisible(false);
                }
        }
        if(state == 1)
        {
-                if(!friend_status->isOnline())
+                if(friend_status && !friend_status->isOnline())
                {
                        childSetEnabled("offer_teleport_btn", false);
                }
diff --git a/linden/indra/newview/llfloatergroupinfo.cpp b/linden/indra/newview/llfloatergroupinfo.cpp
index 348f31f..3e8eae5 100644
--- a/linden/indra/newview/llfloatergroupinfo.cpp
+++ b/linden/indra/newview/llfloatergroupinfo.cpp
@@ -191,7 +191,7 @@ void LLFloaterGroupInfo::showNotice(const char* subject,
                // We need to clean up that inventory offer.
                if (inventory_offer)
        {
-                        inventory_offer_callback( 1 , inventory_offer); 
+                        inventory_offer_callback( IOR_DECLINE , inventory_offer); 
        }
                return;
        }
@@ -203,7 +203,7 @@ void LLFloaterGroupInfo::showNotice(const char* subject,
                // We need to clean up that inventory offer.
                if (inventory_offer)
        {
-                        inventory_offer_callback( 1 , inventory_offer); 
+                        inventory_offer_callback( IOR_DECLINE , inventory_offer); 
        }
                return;
        }
diff --git a/linden/indra/newview/llfloaterhtml.cpp b/linden/indra/newview/llfloaterhtml.cpp
index 519a031..0c5bdcd 100644
--- a/linden/indra/newview/llfloaterhtml.cpp
+++ b/linden/indra/newview/llfloaterhtml.cpp
@@ -49,8 +49,12 @@ LLFloaterHtml* LLFloaterHtml::getInstance()
 ////////////////////////////////////////////////////////////////////////////////
 //
 LLFloaterHtml::LLFloaterHtml()
-:       LLFloater( "HTML Floater" ),
+:       LLFloater( "HTML Floater" )
+#if LL_LIBXUL_ENABLED
+        ,
        mWebBrowser( 0 )
+#endif // LL_LIBXUL_ENABLED
 {
        // create floater from its XML definition
        gUICtrlFactory->buildFloater( this, "floater_html.xml" );
@@ -60,6 +64,7 @@ LLFloaterHtml::LLFloaterHtml()
        reshape( rect.getWidth(), rect.getHeight(), FALSE );
        setRect( rect );
+#if LL_LIBXUL_ENABLED
        mWebBrowser = LLViewerUICtrlFactory::getWebBrowserByName(this,  "html_floater_browser" );
        if ( mWebBrowser )
        {
@@ -72,7 +77,8 @@ LLFloaterHtml::LLFloaterHtml()
                // don't automatically open secondlife links since we want to catch
                // special ones that do other stuff (like open F1 Help)
                mWebBrowser->setOpenSecondLifeLinksInMap( false );
-        };
+        }
+#endif // LL_LIBXUL_ENABLED
                        
        childSetAction("close_btn", onClickClose, this);
        setDefaultBtn("close_btn");
@@ -82,9 +88,11 @@ LLFloaterHtml::LLFloaterHtml()
 //
 LLFloaterHtml::~LLFloaterHtml()
 {
+#if LL_LIBXUL_ENABLED
        // stop observing browser events
        if ( mWebBrowser )
                mWebBrowser->remObserver( this );
+#endif // LL_LIBXUL_ENABLED
        // save position of floater
        gSavedSettings.setRect( "HtmlFloaterRect", mRect );
@@ -103,9 +111,11 @@ void LLFloaterHtml::show( LLString content_id )
        // set the title 
        setTitle( childGetValue( title_str ).asString() );
+#if LL_LIBXUL_ENABLED
        // navigate to the URL
        if ( mWebBrowser )
                mWebBrowser->navigateTo( childGetValue( url_str ).asString() );
+#endif // LL_LIBXUL_ENABLED
        // make floater appear
        setVisibleAndFrontmost();
@@ -131,6 +141,7 @@ void LLFloaterHtml::onClickClose( void* data )
 //
 void LLFloaterHtml::onClickLinkSecondLife( const EventType& eventIn )
 {
+#if LL_LIBXUL_ENABLED
        const std::string protocol( "secondlife://app." );
        // special 'app' secondlife link (using a different protocol - one that isn't registered in the browser) causes bad
@@ -144,11 +155,12 @@ void LLFloaterHtml::onClickLinkSecondLife( const EventType& eventIn )
                if ( LLString::compareInsensitive( cmd.c_str() , "floater.html.help" ) == 0 )
                {
                        gViewerHtmlHelp.show();
-                };
+                }
        }
        else
        // regular secondlife link - just open the map as normal
        {
                mWebBrowser->openMapAtlocation( eventIn.getStringValue() );
-        };
+        }
-};
-\ No newline at end of file
+#endif // LL_LIBXUL_ENABLED
+};
diff --git a/linden/indra/newview/llfloaterhtml.h b/linden/indra/newview/llfloaterhtml.h
index 9a09baf..fef57d0 100644
--- a/linden/indra/newview/llfloaterhtml.h
+++ b/linden/indra/newview/llfloaterhtml.h
@@ -51,9 +51,11 @@ class LLFloaterHtml :
                
        private:
                LLFloaterHtml();
+#if LL_LIBXUL_ENABLED
                LLWebBrowserCtrl* mWebBrowser;
+#endif // LL_LIBXUL_ENABLED
                static LLFloaterHtml* sInstance;
                LLButton* mCloseButton;
 };
-#endif
-\ No newline at end of file
+#endif
diff --git a/linden/indra/newview/llfloaterimport.cpp b/linden/indra/newview/llfloaterimport.cpp
index 72cf2e0..ed71c1b 100644
--- a/linden/indra/newview/llfloaterimport.cpp
+++ b/linden/indra/newview/llfloaterimport.cpp
@@ -44,12 +44,13 @@
 #include "llface.h"
 #include "llinventorymodel.h"
 #include "lllineeditor.h"
+#include "llresourcedata.h"
 #include "lltextbox.h"
 #include "lltoolmgr.h"
 #include "llui.h"
 #include "lluploaddialog.h"
 #include "llviewercamera.h"
-#include "llviewermenu.h"
+#include "llviewermenufile.h"   // upload_new_resource()
 #include "llviewerwindow.h"
 #include "llvoavatar.h"
 #include "pipeline.h"
@@ -264,9 +265,8 @@ BOOL LLFloaterImport::postBuild()
                                        FILE* fCheck = LLFile::fopen(image_path.c_str(), "rb"); /*Flawfinder: ignore*/
                                        if (fCheck)
                                        {
-                                                LLMD5 my_md5_hash(fCheck);
+                                                LLMD5 my_md5_hash(fCheck); // this fclose()s fCheck too
                                                my_md5_hash.hex_digest(md5_hash_string);
-                                                fclose(fCheck);
                                                llinfos << "hash: " << md5_hash_string << llendl;
                                        }
@@ -474,7 +474,7 @@ void LLFloaterImport::finishImport(ImportAssetInfo *info)
                                char  *buffer = new char[length];
                                ll_apr_file_read(fIn, buffer, length);
                                ll_apr_file_write(fOut, buffer, length);
-                                delete buffer;
+                                delete[] buffer;
                                generated_file = true;
                                apr_file_close(fOut);
                        }
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index 1548c0e..80da7b6 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -64,42 +64,54 @@ void LLFloaterInspect::show(void* ignored)
 void LLFloaterInspect::onClickCreatorProfile(void* ctrl)
 {
        if(sInstance->mObjectList->getAllSelected().size() == 0) return;
-        LLSelectNode* obj = sInstance->mObjectSelection->getFirstNode();
+        LLScrollListItem* first_selected =
-        LLUUID obj_id, creator_id;
+                sInstance->mObjectList->getFirstSelected();
-        obj_id = sInstance->mObjectList->getFirstSelected()->getUUID();
-        while(obj)
+        if (first_selected)
        {
-                if(obj_id == obj->getObject()->getID())
+                LLSelectNode* obj= sInstance->mObjectSelection->getFirstNode();
+                LLUUID obj_id, creator_id;
+                obj_id = first_selected->getUUID();
+                while(obj)
                {
-                        creator_id = obj->mPermissions->getCreator();
+                        if(obj_id == obj->getObject()->getID())
-                        break;
+                        {
+                                creator_id = obj->mPermissions->getCreator();
+                                break;
+                        }
+                        obj = sInstance->mObjectSelection->getNextNode();
+                }
+                if(obj)
+                {
+                        LLFloaterAvatarInfo::showFromDirectory(creator_id);
                }
-                obj = sInstance->mObjectSelection->getNextNode();
-        }
-        if(obj)
-        {
-                LLFloaterAvatarInfo::showFromDirectory(creator_id);
        }
 }
 void LLFloaterInspect::onClickOwnerProfile(void* ctrl)
 {
        if(sInstance->mObjectList->getAllSelected().size() == 0) return;
-        LLSelectNode* obj = sInstance->mObjectSelection->getFirstNode();
+        LLScrollListItem* first_selected =
-        LLUUID obj_id, owner_id;
+                sInstance->mObjectList->getFirstSelected();
-        obj_id = sInstance->mObjectList->getFirstSelected()->getUUID();
-        while(obj)
+        if (first_selected)
        {
-                if(obj_id == obj->getObject()->getID())
+                LLSelectNode* obj= sInstance->mObjectSelection->getFirstNode();
+                LLUUID obj_id, owner_id;
+                obj_id = first_selected->getUUID();
+                while(obj)
                {
-                        owner_id = obj->mPermissions->getOwner();
+                        if(obj_id == obj->getObject()->getID())
-                        break;
+                        {
+                                owner_id = obj->mPermissions->getOwner();
+                                break;
+                        }
+                        obj = sInstance->mObjectSelection->getNextNode();
+                }
+                if(obj)
+                {
+                        LLFloaterAvatarInfo::showFromDirectory(owner_id);
                }
-                obj = sInstance->mObjectSelection->getNextNode();
-        }
-        if(obj)
-        {
-                LLFloaterAvatarInfo::showFromDirectory(owner_id);
        }
 }
@@ -125,7 +137,15 @@ LLUUID LLFloaterInspect::getSelectedUUID()
 {
        if(sInstance)
        {
-                if(sInstance->mObjectList->getAllSelected().size() > 0) return sInstance->mObjectList->getFirstSelected()->getUUID();
+                if(sInstance->mObjectList->getAllSelected().size() > 0)
+                {
+                        LLScrollListItem* first_selected =
+                                sInstance->mObjectList->getFirstSelected();
+                        if (first_selected)
+                        {
+                                return first_selected->getUUID();
+                        }
+                }
        }
        return LLUUID::null;
 }
@@ -139,7 +159,15 @@ void LLFloaterInspect::refresh()
        childSetEnabled("button creator", false);
        LLUUID selected_uuid;
        S32 selected_index = mObjectList->getFirstSelectedIndex();
-        if(selected_index > -1) selected_uuid = mObjectList->getFirstSelected()->getUUID();
+        if(selected_index > -1)
+        {
+                LLScrollListItem* first_selected =
+                        mObjectList->getFirstSelected();
+                if (first_selected)
+                {
+                        selected_uuid = first_selected->getUUID();
+                }
+        }
        mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE);
        //List all transient objects, then all linked objects
        LLSelectNode* obj = mObjectSelection->getFirstNode();
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index 9ff44f4..82b50ec 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -1996,12 +1996,18 @@ BOOL LLPanelLandOptions::postBuild()
        
        mSnapshotCtrl = LLUICtrlFactory::getTexturePickerByName(this, "snapshot_ctrl");
-        mSnapshotCtrl->setCommitCallback( onCommitAny );
+        if (mSnapshotCtrl)
-        mSnapshotCtrl->setCallbackUserData( this );
+        {
-        mSnapshotCtrl->setAllowNoTexture ( TRUE );
+                mSnapshotCtrl->setCommitCallback( onCommitAny );
-        mSnapshotCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+                mSnapshotCtrl->setCallbackUserData( this );
-        mSnapshotCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+                mSnapshotCtrl->setAllowNoTexture ( TRUE );
+                mSnapshotCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+                mSnapshotCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+        }
+        else
+        {
+                llwarns << "LLUICtrlFactory::getTexturePickerByName() returned NULL for 'snapshot_ctrl'" << llendl;
+        }
        mLocationText = LLUICtrlFactory::getTextBoxByName(this, "Landing Point: (none)");
@@ -2333,12 +2339,19 @@ BOOL LLPanelLandMedia::postBuild()
        mMediaTextureCtrl = LLUICtrlFactory::getTexturePickerByName(this, "media texture");
-        mMediaTextureCtrl->setCommitCallback( onCommitAny );
+        if (mMediaTextureCtrl)
-        mMediaTextureCtrl->setCallbackUserData( this );
+        {
-        mMediaTextureCtrl->setAllowNoTexture ( TRUE );
+                mMediaTextureCtrl->setCommitCallback( onCommitAny );
-        mMediaTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+                mMediaTextureCtrl->setCallbackUserData( this );
-        mMediaTextureCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+                mMediaTextureCtrl->setAllowNoTexture ( TRUE );
+                mMediaTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+                mMediaTextureCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
+        }
+        else
+        {
+                llwarns << "LLUICtrlFactory::getTexturePickerByName() returned NULL for 'media texure'" << llendl;
+        }
+                
        mMediaAutoScaleCheck = LLUICtrlFactory::getCheckBoxByName(this, "media_auto_scale");
        childSetCommitCallback("media_auto_scale", onCommitAny, this);
diff --git a/linden/indra/newview/llfloaternamedesc.cpp b/linden/indra/newview/llfloaternamedesc.cpp
index f5ef7dc..5f41b13 100644
--- a/linden/indra/newview/llfloaternamedesc.cpp
+++ b/linden/indra/newview/llfloaternamedesc.cpp
@@ -29,6 +29,8 @@
 #include "llviewerprecompiledheaders.h"
 #include "llfloaternamedesc.h"
+// project includes
 #include "lllineeditor.h"
 #include "llresmgr.h"
 #include "lltextbox.h"
@@ -36,13 +38,16 @@
 #include "llviewerwindow.h"
 #include "llfocusmgr.h"
 #include "llradiogroup.h"
-#include "llassetstorage.h"
 #include "lldbstrings.h"
 #include "lldir.h"
 #include "llviewercontrol.h"
-#include "llviewermenu.h"
+#include "llviewermenufile.h"   // upload_new_resource()
 #include "llvieweruictrlfactory.h"
+// linden includes
+#include "llassetstorage.h"
+#include "llinventorytype.h"
 const S32 PREVIEW_LINE_HEIGHT = 19;
 const S32 PREVIEW_CLOSE_BOX_SIZE = 16;
 const S32 PREVIEW_BORDER_WIDTH = 2;
diff --git a/linden/indra/newview/llfloaternewim.cpp b/linden/indra/newview/llfloaternewim.cpp
index 2fa2b51..1adb37c 100644
--- a/linden/indra/newview/llfloaternewim.cpp
+++ b/linden/indra/newview/llfloaternewim.cpp
@@ -74,8 +74,15 @@ BOOL LLFloaterNewIM::postBuild()
                childSetAction("start_btn", &LLFloaterNewIM::onStart, this);
                childSetAction("close_btn", &LLFloaterNewIM::onClickClose, this);
                mSelectionList = LLViewerUICtrlFactory::getNameListByName(this, "user_list");
-                mSelectionList->setDoubleClickCallback(&LLFloaterNewIM::onStart);
+                if (mSelectionList)
-                mSelectionList->setCallbackUserData(this);
+                {
+                        mSelectionList->setDoubleClickCallback(&LLFloaterNewIM::onStart);
+                        mSelectionList->setCallbackUserData(this);
+                }
+                else
+                {
+                        llwarns << "LLViewerUICtrlFactory::getNameListByName() returned NULL for 'user_list'" << llendl;
+                }
                sOnlineDescriptor = childGetValue("online_descriptor").asString();
                sNameFormat = childGetValue("name_format").asString();
                setDefaultBtn("start_btn");
diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index dceadf9..963c268 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -156,6 +156,66 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton
 //      addTabPanel(mWebPanel, "Web", FALSE, onTabChanged, this);
 }
+LLPreferenceCore::~LLPreferenceCore()
+{
+        if (mGeneralPanel)
+        {
+                delete mGeneralPanel;
+                mGeneralPanel = NULL;
+        }
+        if (mInputPanel)
+        {
+                delete mInputPanel;
+                mInputPanel = NULL;
+        }
+        if (mNetworkPanel)
+        {
+                delete mNetworkPanel;
+                mNetworkPanel = NULL;
+        }
+        if (mDisplayPanel)
+        {
+                delete mDisplayPanel;
+                mDisplayPanel = NULL;
+        }
+        if (mDisplayPanel2)
+        {
+                delete mDisplayPanel2;
+                mDisplayPanel2 = NULL;
+        }
+        if (mDisplayPanel3)
+        {
+                delete mDisplayPanel3;
+                mDisplayPanel3 = NULL;
+        }
+        if (mAudioPanel)
+        {
+                delete mAudioPanel;
+                mAudioPanel = NULL;
+        }
+        if (mPrefsChat)
+        {
+                delete mPrefsChat;
+                mPrefsChat = NULL;
+        }
+        if (mPrefsIM)
+        {
+                delete mPrefsIM;
+                mPrefsIM = NULL;
+        }
+        if (mMsgPanel)
+        {
+                delete mMsgPanel;
+                mMsgPanel = NULL;
+        }
+        //if (mWebPanel)
+        //{
+        //      delete mWebPanel;
+        //      mWebPanel = NULL;
+        //}
+}
 void LLPreferenceCore::apply()
 {
        mGeneralPanel->apply();
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index dcef6a0..7a6789f 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -58,6 +58,7 @@ class LLPreferenceCore
 public:
        LLPreferenceCore(LLTabContainerCommon* tab_container, LLButton * default_btn);
+        ~LLPreferenceCore();
        void apply();
        void cancel();
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 7fa5f6a..682fda8 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -74,7 +74,6 @@
 const S32 TERRAIN_TEXTURE_COUNT = 4;
 const S32 CORNER_COUNT = 4;
-#define LL_ENABLE_MAINLAND_VISIBLE_CONTROL 0
 ///----------------------------------------------------------------------------
 /// Local class declaration
@@ -1920,9 +1919,6 @@ BOOL LLPanelEstateInfo::postBuild()
 {
        // set up the callbacks for the generic controls
        initCtrl("externally_visible_check");
-#if LL_ENABLE_MAINLAND_VISIBLE_CONTROL
-        initCtrl("mainland_visible_check");
-#endif
        initCtrl("use_global_time_check");
        initCtrl("fixed_sun_check");
        initCtrl("allow_direct_teleport");
@@ -1934,9 +1930,6 @@ BOOL LLPanelEstateInfo::postBuild()
        initHelpBtn("use_global_time_help",                     "HelpEstateUseGlobalTime");
        initHelpBtn("fixed_sun_help",                           "HelpEstateFixedSun");
        initHelpBtn("externally_visible_help",          "HelpEstateExternallyVisible");
-#if LL_ENABLE_MAINLAND_VISIBLE_CONTROL
-        initHelpBtn("mainland_visible_help",            "HelpEstateMainlandVisible");
-#endif
        initHelpBtn("allow_direct_teleport_help",       "HelpEstateAllowDirectTeleport");
        initHelpBtn("allow_resident_help",                      "HelpEstateAllowResident");
        initHelpBtn("allow_group_help",                         "HelpEstateAllowGroup");
@@ -2105,9 +2098,6 @@ void LLPanelEstateInfo::commitEstateInfo()
 void LLPanelEstateInfo::setEstateFlags(U32 flags)
 {
        childSetValue("externally_visible_check", LLSD(flags & REGION_FLAGS_EXTERNALLY_VISIBLE ? TRUE : FALSE) );
-#if LL_ENABLE_MAINLAND_VISIBLE_CONTROL
-        childSetValue("mainland_visible_check", LLSD(flags & REGION_FLAGS_MAINLAND_VISIBLE ? TRUE : FALSE) );
-#endif
        childSetValue("fixed_sun_check", LLSD(flags & REGION_FLAGS_SUN_FIXED ? TRUE : FALSE) );
        childSetValue("allow_direct_teleport", LLSD(flags & REGION_FLAGS_ALLOW_DIRECT_TELEPORT ? TRUE : FALSE) );
        childSetValue("deny_anonymous", LLSD(flags & REGION_FLAGS_DENY_ANONYMOUS ? TRUE : FALSE) );
@@ -2124,15 +2114,6 @@ U32 LLPanelEstateInfo::computeEstateFlags()
        {
                flags |= REGION_FLAGS_EXTERNALLY_VISIBLE;
        }
-#if LL_ENABLE_MAINLAND_VISIBLE_CONTROL
-        // This flag is ignored by everything. 2006-11-17 Phoenix.
-        if (childGetValue("mainland_visible_check").asBoolean())
-        {
-                flags |= REGION_FLAGS_MAINLAND_VISIBLE;
-        }
-#else
-        flags |= REGION_FLAGS_MAINLAND_VISIBLE;
-#endif
        
        if (childGetValue("allow_direct_teleport").asBoolean())
        {
diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 2e44191..bcbab5b 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -66,10 +66,9 @@
 #include "lluploaddialog.h"
 #include "llcallingcard.h"
 #include "llviewerobjectlist.h"
-#include "llagent.h"
 #include "lltoolobjpicker.h"
 #include "lltoolmgr.h"
-#include "llviewermenu.h"               // for LLResourceData
+#include "llresourcedata.h"             // for LLResourceData
 #include "llviewerwindow.h"
 #include "llviewerimagelist.h"
 #include "llworldmap.h"
@@ -965,8 +964,8 @@ void LLFloaterReporter::uploadDoneCallback(const LLUUID &uuid, void *user_data,
                self->mScreenID = uuid;
                llinfos << "Got screen shot " << uuid << llendl;
                self->sendReportViaLegacy(self->gatherReport());
+                self->close();
        }
-        self->close();
 }
diff --git a/linden/indra/newview/llfloatersellland.cpp b/linden/indra/newview/llfloatersellland.cpp
index 49cb14e..49cb14e 100755..100644
--- a/linden/indra/newview/llfloatersellland.cpp
+++ b/linden/indra/newview/llfloatersellland.cpp
diff --git a/linden/indra/newview/llfloatersellland.h b/linden/indra/newview/llfloatersellland.h
index 1f0af61..1f0af61 100755..100644
--- a/linden/indra/newview/llfloatersellland.h
+++ b/linden/indra/newview/llfloatersellland.h
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index af58cd9..5008509 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -53,7 +53,7 @@
 #include "llviewerstats.h"
 #include "llviewercamera.h"
 #include "llviewerwindow.h"
-#include "llviewermenu.h"
+#include "llviewermenufile.h"   // upload_new_resource()
 #include "llfloaterpostcard.h"
 #include "llcheckboxctrl.h"
 #include "llradiogroup.h"
diff --git a/linden/indra/newview/llfloatertest.cpp b/linden/indra/newview/llfloatertest.cpp
index 510072d..c5e353a 100644
--- a/linden/indra/newview/llfloatertest.cpp
+++ b/linden/indra/newview/llfloatertest.cpp
@@ -227,8 +227,7 @@ LLFloaterTestImpl::LLFloaterTestImpl()
        combo = new LLComboBox("combo",
                LLRect(LEFT, y, LEFT+100, y-LLCOMBOBOX_HEIGHT),
                "Combobox Label",
-                onCommitCombo, this,
+                onCommitCombo, this);
-                150);   // list_width
        combo->add("first item");
        combo->add("second item");
        combo->add("should go to the top", ADD_TOP);
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 0480628..3931acb 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -314,8 +314,8 @@ BOOL	LLFloaterTools::postBuild()
                mTab->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
                mTab->setVisible( gSavedSettings.getBOOL("ToolboxShowMore") );
                mTab->setBorderVisible(FALSE);
+                mTab->selectFirstTab();
        }
-        mTab->selectFirstTab();
        return TRUE;
 }
diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index 6b38ca8..3ea8c49 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -182,7 +182,6 @@ BOOL LLFloaterTOS::postBuild()
        childSetValue("tos_text", LLSD(mMessage));      
 #endif
        return TRUE;
 }
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 7bc9cd8..ff0ad3f 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -229,6 +229,16 @@ LLFolderViewItem* LLFolderViewItem::getPreviousOpenNode(BOOL include_children)
        return itemp;
 }
+// is this item something we think we should be showing?
+// for example, if we haven't gotten around to filtering it yet, then the answer is yes
+// until we find out otherwise
+BOOL LLFolderViewItem::potentiallyVisible()
+{
+        // we haven't been checked against min required filter
+        // or we have and we passed
+        return getLastFilterGeneration() < getRoot()->getFilter()->getMinRequiredGeneration() || getFiltered();
+}
 BOOL LLFolderViewItem::getFiltered() 
 { 
        return mFiltered && mLastFilterGeneration >= mRoot->getFilter()->getMinRequiredGeneration(); 
@@ -335,8 +345,7 @@ void LLFolderViewItem::setSelectionFromRoot(LLFolderViewItem* selection,
 }
 // helper function to change the selection from the root.
-void LLFolderViewItem::changeSelectionFromRoot(LLFolderViewItem* selection,
+void LLFolderViewItem::changeSelectionFromRoot(LLFolderViewItem* selection, BOOL selected)
-                                                                                           BOOL selected)
 {
        getRoot()->changeSelection(selection, selected);
 }
@@ -358,6 +367,11 @@ LLString LLFolderViewItem::getWidgetTag() const
        return LL_FOLDER_VIEW_ITEM_TAG;
 }
+EInventorySortGroup LLFolderViewItem::getSortGroup() 
+{ 
+        return SG_ITEM; 
+}
 // addToFolder() returns TRUE if it succeeds. FALSE otherwise
 BOOL LLFolderViewItem::addToFolder(LLFolderViewFolder* folder, LLFolderView* root)
 {
@@ -427,8 +441,7 @@ void LLFolderViewItem::dirtyFilter()
 // means 'deselect' for a leaf item. Do this optimization after
 // multiple selection is implemented to make sure it all plays nice
 // together.
-BOOL LLFolderViewItem::setSelection(LLFolderViewItem* selection, BOOL open,
+BOOL LLFolderViewItem::setSelection(LLFolderViewItem* selection, BOOL open, BOOL take_keyboard_focus)
-                                                                        BOOL take_keyboard_focus)
 {
        if( selection == this )
        {
@@ -445,8 +458,7 @@ BOOL LLFolderViewItem::setSelection(LLFolderViewItem* selection, BOOL open,
        return mIsSelected;
 }
-BOOL LLFolderViewItem::changeSelection(LLFolderViewItem* selection,
+BOOL LLFolderViewItem::changeSelection(LLFolderViewItem* selection, BOOL selected)
-                                                                           BOOL selected)
 {
        if(selection == this && mIsSelected != selected)
        {
@@ -788,182 +800,174 @@ BOOL LLFolderViewItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 void LLFolderViewItem::draw()
 {
-        if(  getVisible() )
+        bool possibly_has_children = false;
+        bool up_to_date = mListener && mListener->isUpToDate();
+        if((up_to_date && hasVisibleChildren() ) || // we fetched our children and some of them have passed the filter...
+                (!up_to_date && mListener && mListener->hasChildren())) // ...or we know we have children but haven't fetched them (doesn't obey filter)
        {
-                bool possibly_has_children = false;
+                possibly_has_children = true;
-                bool up_to_date = mListener && mListener->isUpToDate();
+        }
-                if((up_to_date && hasVisibleChildren() ) || // we fetched our children and some of them have passed the filter...
+        if(/*mControlLabel[0] != '\0' && */possibly_has_children)
-                        (!up_to_date && mListener && mListener->hasChildren())) // ...or we know we have children but haven't fetched them (doesn't obey filter)
+        {
-                {
+                LLGLSTexture gls_texture;
-                        possibly_has_children = true;
+                if (mArrowImage)
-                }
-                if(/*mControlLabel[0] != '\0' && */possibly_has_children)
                {
-                        LLGLSTexture gls_texture;
+                        gl_draw_scaled_rotated_image(mIndentation, mRect.getHeight() - ARROW_SIZE - TEXT_PAD,
-                        if (mArrowImage)
+                                ARROW_SIZE, ARROW_SIZE, mControlLabelRotation, mArrowImage, sFgColor);
-                        {
-                                gl_draw_scaled_rotated_image(mIndentation, mRect.getHeight() - ARROW_SIZE - TEXT_PAD,
-                                        ARROW_SIZE, ARROW_SIZE, mControlLabelRotation, mArrowImage, sFgColor);
-                        }
                }
+        }
-                F32 text_left = (F32)(ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD + mIndentation);
+        F32 text_left = (F32)(ARROW_SIZE + TEXT_PAD + ICON_WIDTH + ICON_PAD + mIndentation);
-                // If we have keyboard focus, draw selection filled
+        // If we have keyboard focus, draw selection filled
-                BOOL show_context = getRoot()->getShowSelectionContext();
+        BOOL show_context = getRoot()->getShowSelectionContext();
-                BOOL filled = show_context || (gFocusMgr.getKeyboardFocus() == getRoot());
+        BOOL filled = show_context || (gFocusMgr.getKeyboardFocus() == getRoot());
-                // always render "current" item, only render other selected items if
+        // always render "current" item, only render other selected items if
-                // mShowSingleSelection is FALSE
+        // mShowSingleSelection is FALSE
-                if( mIsSelected )
+        if( mIsSelected )
+        {
+                LLGLSNoTexture gls_no_texture;
+                LLColor4 bg_color = sHighlightBgColor;
+                //const S32 TRAILING_PAD = 5;  // It just looks better with this.
+                if (!mIsCurSelection)
                {
-                        LLGLSNoTexture gls_no_texture;
+                        // do time-based fade of extra objects
-                        LLColor4 bg_color = sHighlightBgColor;
+                        F32 fade_time = getRoot()->getSelectionFadeElapsedTime();
-                        //const S32 TRAILING_PAD = 5;  // It just looks better with this.
+                        if (getRoot()->getShowSingleSelection())
-                        if (!mIsCurSelection)
                        {
-                                // do time-based fade of extra objects
+                                // fading out
-                                F32 fade_time = getRoot()->getSelectionFadeElapsedTime();
+                                bg_color.mV[VALPHA] = clamp_rescale(fade_time, 0.f, 0.4f, bg_color.mV[VALPHA], 0.f);
-                                if (getRoot()->getShowSingleSelection())
-                                {
-                                        // fading out
-                                        bg_color.mV[VALPHA] = clamp_rescale(fade_time, 0.f, 0.4f, bg_color.mV[VALPHA], 0.f);
-                                }
-                                else
-                                {
-                                        // fading in
-                                        bg_color.mV[VALPHA] = clamp_rescale(fade_time, 0.f, 0.4f, 0.f, bg_color.mV[VALPHA]);
-                                }
                        }
+                        else
+                        {
+                                // fading in
+                                bg_color.mV[VALPHA] = clamp_rescale(fade_time, 0.f, 0.4f, 0.f, bg_color.mV[VALPHA]);
+                        }
+                }
+                gl_rect_2d(
+                        0, 
+                        mRect.getHeight(), 
+                        mRect.getWidth() - 2,
+                        llfloor(mRect.getHeight() - sFont->getLineHeight() - ICON_PAD),
+                        bg_color, filled);
+                if (mIsCurSelection)
+                {
                        gl_rect_2d(
                                0, 
                                mRect.getHeight(), 
                                mRect.getWidth() - 2,
                                llfloor(mRect.getHeight() - sFont->getLineHeight() - ICON_PAD),
-                                bg_color, filled);
+                                sHighlightFgColor, FALSE);
-                        if (mIsCurSelection)
-                        {
-                                gl_rect_2d(
-                                        0, 
-                                        mRect.getHeight(), 
-                                        mRect.getWidth() - 2,
-                                        llfloor(mRect.getHeight() - sFont->getLineHeight() - ICON_PAD),
-                                        sHighlightFgColor, FALSE);
-                        }
-                        if (mRect.getHeight() > llround(sFont->getLineHeight()) + ICON_PAD + 2)
-                        {
-                                gl_rect_2d(
-                                        0, 
-                                        llfloor(mRect.getHeight() - sFont->getLineHeight() - ICON_PAD) - 2, 
-                                        mRect.getWidth() - 2,
-                                        2,
-                                        sHighlightFgColor, FALSE);
-                                if (show_context)
-                                {
-                                        gl_rect_2d(
-                                                0, 
-                                                llfloor(mRect.getHeight() - sFont->getLineHeight() - ICON_PAD) - 2, 
-                                                mRect.getWidth() - 2,
-                                                2,
-                                                sHighlightBgColor, TRUE);
-                                }
-                        }
                }
-                if (mDragAndDropTarget)
+                if (mRect.getHeight() > llround(sFont->getLineHeight()) + ICON_PAD + 2)
                {
-                        LLGLSNoTexture gls_no_texture;
                        gl_rect_2d(
                                0, 
-                                mRect.getHeight(), 
+                                llfloor(mRect.getHeight() - sFont->getLineHeight() - ICON_PAD) - 2, 
                                mRect.getWidth() - 2,
-                                llfloor(mRect.getHeight() - sFont->getLineHeight() - ICON_PAD),
+                                2,
-                                sHighlightBgColor, FALSE);
+                                sHighlightFgColor, FALSE);
+                        if (show_context)
-                        if (mRect.getHeight() > llround(sFont->getLineHeight()) + ICON_PAD + 2)
                        {
                                gl_rect_2d(
                                        0, 
                                        llfloor(mRect.getHeight() - sFont->getLineHeight() - ICON_PAD) - 2, 
                                        mRect.getWidth() - 2,
                                        2,
-                                        sHighlightBgColor, FALSE);
+                                        sHighlightBgColor, TRUE);
                        }
-                        mDragAndDropTarget = FALSE;
                }
+        }
+        if (mDragAndDropTarget)
+        {
+                LLGLSNoTexture gls_no_texture;
+                gl_rect_2d(
+                        0, 
+                        mRect.getHeight(), 
+                        mRect.getWidth() - 2,
+                        llfloor(mRect.getHeight() - sFont->getLineHeight() - ICON_PAD),
+                        sHighlightBgColor, FALSE);
+                if (mRect.getHeight() > llround(sFont->getLineHeight()) + ICON_PAD + 2)
-                if(mIcon)
                {
-                        gl_draw_image(mIndentation + ARROW_SIZE + TEXT_PAD, mRect.getHeight() - mIcon->getHeight(), mIcon);
+                        gl_rect_2d(
-                        mIcon->addTextureStats( (F32)(mIcon->getWidth() * mIcon->getHeight()));
+                                0, 
+                                llfloor(mRect.getHeight() - sFont->getLineHeight() - ICON_PAD) - 2, 
+                                mRect.getWidth() - 2,
+                                2,
+                                sHighlightBgColor, FALSE);
                }
+                mDragAndDropTarget = FALSE;
+        }
-                if (!mLabel.empty())
-                {
-                        // highlight filtered text
-                        BOOL debug_filters = getRoot()->getDebugFilters();
-                        LLColor4 color = ( (mIsSelected && filled) ? sHighlightFgColor : sFgColor );
-                        F32 right_x;
-                        F32 y = (F32)mRect.getHeight() - sFont->getLineHeight() - (F32)TEXT_PAD;
-                        if (debug_filters)
+        if(mIcon)
-                        {
+        {
-                                if (!getFiltered() && !possibly_has_children)
+                gl_draw_image(mIndentation + ARROW_SIZE + TEXT_PAD, mRect.getHeight() - mIcon->getHeight(), mIcon);
-                                {
+                mIcon->addTextureStats( (F32)(mIcon->getWidth() * mIcon->getHeight()));
-                                        color.mV[VALPHA] *= 0.5f;
+        }
-                                }
-                                
-                                LLColor4 filter_color = mLastFilterGeneration >= getRoot()->getFilter()->getCurrentGeneration() ? LLColor4(0.5f, 0.8f, 0.5f, 1.f) : LLColor4(0.8f, 0.5f, 0.5f, 1.f);
-                                sSmallFont->renderUTF8(mStatusText, 0, text_left, y, filter_color,
-                                                                LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL,
-                                                                S32_MAX, S32_MAX, &right_x, FALSE );
-                                text_left = right_x;
-                        }
-                        sFont->renderUTF8( mLabel, 0, text_left, y, color,
+        if (!mLabel.empty())
-                                                           LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle,
+        {
-                                                           S32_MAX, S32_MAX, &right_x, FALSE );
+                // highlight filtered text
-                        if (!mLabelSuffix.empty())
+                BOOL debug_filters = getRoot()->getDebugFilters();
-                        {
+                LLColor4 color = ( (mIsSelected && filled) ? sHighlightFgColor : sFgColor );
-                                sFont->renderUTF8( mLabelSuffix, 0, right_x, y, LLColor4(0.75f, 0.85f, 0.85f, 1.f),
+                F32 right_x;
-                                                                   LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle,
+                F32 y = (F32)mRect.getHeight() - sFont->getLineHeight() - (F32)TEXT_PAD;
-                                                                   S32_MAX, S32_MAX, &right_x, FALSE );
-                        }
-                        if (mBoxImage.notNull() && mStringMatchOffset != LLString::npos)
+                if (debug_filters)
+                {
+                        if (!getFiltered() && !possibly_has_children)
                        {
-                                // don't draw backgrounds for zero-length strings
+                                color.mV[VALPHA] *= 0.5f;
-                                S32 filter_string_length = mRoot->getFilterSubString().size();
-                                if (filter_string_length > 0)
-                                {
-                                        LLString 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(mRect.getHeight() - sFont->getLineHeight() - 3);
-                                        S32 top = mRect.getHeight();
-                                        LLViewerImage::bindTexture(mBoxImage);
-                                        glColor4fv(sFilterBGColor.mV);
-                                        gl_segmented_rect_2d_tex(left, top, right, bottom, mBoxImage->getWidth(), mBoxImage->getHeight(), 16);
-                                        F32 match_string_left = text_left + sFont->getWidthF32(combined_string, 0, mStringMatchOffset);
-                                        F32 y = (F32)mRect.getHeight() - sFont->getLineHeight() - (F32)TEXT_PAD;
-                                        sFont->renderUTF8( combined_string, mStringMatchOffset, match_string_left, y,
-                                                                        sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle,
-                                                                        filter_string_length, S32_MAX, &right_x, FALSE );
-                                }
                        }
+                        
+                        LLColor4 filter_color = mLastFilterGeneration >= getRoot()->getFilter()->getCurrentGeneration() ? LLColor4(0.5f, 0.8f, 0.5f, 1.f) : LLColor4(0.8f, 0.5f, 0.5f, 1.f);
+                        sSmallFont->renderUTF8(mStatusText, 0, text_left, y, filter_color,
+                                                        LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL,
+                                                        S32_MAX, S32_MAX, &right_x, FALSE );
+                        text_left = right_x;
                }
-                if( sDebugRects )
+                sFont->renderUTF8( mLabel, 0, text_left, y, color,
+                                                        LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle,
+                                                        S32_MAX, S32_MAX, &right_x, FALSE );
+                if (!mLabelSuffix.empty())
                {
-                        drawDebugRect();
+                        sFont->renderUTF8( mLabelSuffix, 0, right_x, y, LLColor4(0.75f, 0.85f, 0.85f, 1.f),
+                                                                LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle,
+                                                                S32_MAX, S32_MAX, &right_x, FALSE );
+                }
+                if (mBoxImage.notNull() && mStringMatchOffset != LLString::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;
+                                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(mRect.getHeight() - sFont->getLineHeight() - 3);
+                                S32 top = mRect.getHeight();
+                                LLViewerImage::bindTexture(mBoxImage);
+                                glColor4fv(sFilterBGColor.mV);
+                                gl_segmented_rect_2d_tex(left, top, right, bottom, mBoxImage->getWidth(), mBoxImage->getHeight(), 16);
+                                F32 match_string_left = text_left + sFont->getWidthF32(combined_string, 0, mStringMatchOffset);
+                                F32 y = (F32)mRect.getHeight() - sFont->getLineHeight() - (F32)TEXT_PAD;
+                                sFont->renderUTF8( combined_string, mStringMatchOffset, match_string_left, y,
+                                                                sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle,
+                                                                filter_string_length, S32_MAX, &right_x, FALSE );
+                        }
                }
        }
-        else if (mStatusText.size())
+        if( sDebugRects )
        {
-                // just draw status text
+                drawDebugRect();
-                sFont->renderUTF8( mStatusText, 0, 0, 1, sFgColor, LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, S32_MAX, S32_MAX, NULL, FALSE );
        }
 }
@@ -977,7 +981,6 @@ LLFolderViewFolder::LLFolderViewFolder( const LLString& name, LLViewerImage* ico
                                                                                LLFolderView* root,
                                                                                LLFolderViewEventListener* listener ): 
        LLFolderViewItem( name, icon, 0, root, listener ),      // 0 = no create time
-        mSortFunction(sort_item_name),
        mIsOpen(FALSE),
        mExpanderHighlighted(FALSE),
        mCurHeight(0.f),
@@ -1246,7 +1249,7 @@ void LLFolderViewFolder::filter( LLInventoryFilter& filter)
        }
        // when applying a filter, matching folders get their contents downloaded first
-        if (filter.isNotDefault() && getFiltered(filter.getMinRequiredGeneration()) && !gInventory.isCategoryComplete(mListener->getUUID()))
+        if (filter.isNotDefault() && getFiltered(filter.getMinRequiredGeneration()) && (mListener && !gInventory.isCategoryComplete(mListener->getUUID())))
        {
                gInventory.startBackgroundFetch(mListener->getUUID());
        }
@@ -1667,7 +1670,8 @@ BOOL LLFolderViewFolder::removeItem(LLFolderViewItem* item)
 {
        if(item->remove())
        {
-                removeView(item);
+                //RN: this seem unneccessary as remove() moves to trash
+                //removeView(item);
                return TRUE;
        }
        return FALSE;
@@ -1677,7 +1681,7 @@ BOOL LLFolderViewFolder::removeItem(LLFolderViewItem* item)
 // listeners.
 void LLFolderViewFolder::removeView(LLFolderViewItem* item)
 {
-        if (!item)
+        if (!item || item->getParentFolder() != this)
        {
                return;
        }
@@ -1722,23 +1726,8 @@ void LLFolderViewFolder::extractItem( LLFolderViewItem* item )
 // This is only called for renaming an object because it won't work for date
 void LLFolderViewFolder::resort(LLFolderViewItem* item)
 {
-        std::sort(mItems.begin(), mItems.end(), *mSortFunction);
+        std::sort(mItems.begin(), mItems.end(), mSortFunction);
-        std::sort(mFolders.begin(), mFolders.end(), *mSortFunction);
+        std::sort(mFolders.begin(), mFolders.end(), mSortFunction);
-        //if(mItems.removeData(item))
-        //{
-        //      mItems.addDataSorted(item);
-        //}
-        //else
-        //{
-        //      // This is an evil downcast. However, it's only doing
-        //      // pointer comparison to find if (which it should be ) the
-        //      // item is in the container, so it's pretty safe.
-        //      LLFolderViewFolder* f = reinterpret_cast<LLFolderViewFolder*>(item);
-        //      if(mFolders.removeData(f))
-        //      {
-        //              mFolders.addDataSorted(f);
-        //      }
-        //}
 }
 bool LLFolderViewFolder::isTrash()
@@ -1752,65 +1741,22 @@ bool LLFolderViewFolder::isTrash()
 void LLFolderViewFolder::sortBy(U32 order)
 {
-        BOOL sort_order_changed = FALSE;
+        if (!mSortFunction.updateSort(order))
-        if (!(order & LLInventoryFilter::SO_DATE))
-        {
-                if (mSortFunction != sort_item_name)
-                {
-                        mSortFunction = sort_item_name;
-                        sort_order_changed = TRUE;
-                }
-        }
-        else
        {
-                if (mSortFunction != sort_item_date)
+                // No changes.
-                {
+                return;
-                        mSortFunction = sort_item_date;
-                        sort_order_changed = TRUE;
-                }
        }
+        // Propegate this change to sub folders
        for (folders_t::iterator iter = mFolders.begin();
                 iter != mFolders.end();)
        {
                folders_t::iterator fit = iter++;
                (*fit)->sortBy(order);
        }
-        if (order & LLInventoryFilter::SO_FOLDERS_BY_NAME)
-        {
-                // sort folders by name if always by name
-                std::sort(mFolders.begin(), mFolders.end(), sort_item_name);
-        }
-        else
-        {
-                // sort folders by the default sort ordering
-                std::sort(mFolders.begin(), mFolders.end(), *mSortFunction);
-                // however, if we are at the root of the inventory and we are sorting by date
+        std::sort(mFolders.begin(), mFolders.end(), mSortFunction);
-                if (mListener->getUUID() == gAgent.getInventoryRootID() && order & LLInventoryFilter::SO_DATE)
+        std::sort(mItems.begin(), mItems.end(), mSortFunction);
-                {
-                        // pull the trash folder and stick it on the end of the list
-                        LLFolderViewFolder *t = NULL;
-                        for (folders_t::iterator fit = mFolders.begin();
-                                 fit != mFolders.end(); ++fit)
-                        {
-                                if ((*fit)->isTrash())
-                                {
-                                        t = *fit;
-                                        mFolders.erase(fit);
-                                        break;
-                                }
-                        }
-                        if (t)
-                        {
-                                mFolders.push_back(t);
-                        }
-                }
-        }
-        if (sort_order_changed)
-        {
-                std::sort(mItems.begin(), mItems.end(), *mSortFunction);
-        }
        if (order & LLInventoryFilter::SO_DATE)
        {
@@ -1834,19 +1780,39 @@ void LLFolderViewFolder::sortBy(U32 order)
        }
 }
-void LLFolderViewFolder::setItemSortFunction(sort_order_f ordering)
+void LLFolderViewFolder::setItemSortOrder(U32 ordering)
 {
-        mSortFunction = ordering;
+        if (mSortFunction.updateSort(ordering))
+        {
+                for (folders_t::iterator iter = mFolders.begin();
+                        iter != mFolders.end();)
+                {
+                        folders_t::iterator fit = iter++;
+                        (*fit)->setItemSortOrder(ordering);
+                }
-        for (folders_t::iterator iter = mFolders.begin();
+                std::sort(mFolders.begin(), mFolders.end(), mSortFunction);
-                 iter != mFolders.end();)
+                std::sort(mItems.begin(), mItems.end(), mSortFunction);
+        }
+}
+EInventorySortGroup LLFolderViewFolder::getSortGroup()
+{
+        if (isTrash())
        {
-                folders_t::iterator fit = iter++;
+                return SG_TRASH_FOLDER;
-                (*fit)->setItemSortFunction(ordering);
        }
-        std::sort(mFolders.begin(), mFolders.end(), *mSortFunction);
+        // Folders that can't be moved are 'system' folders. 
-        std::sort(mItems.begin(), mItems.end(), *mSortFunction);
+        if( mListener )
+        {
+                if( !(mListener->isItemMovable()) )
+                {
+                        return SG_SYSTEM_FOLDER;
+                }
+        }
+        
+        return SG_NORMAL_FOLDER;
 }
 BOOL LLFolderViewFolder::isMovable()
@@ -1917,6 +1883,7 @@ BOOL LLFolderViewFolder::isRemovable()
 // this is an internal method used for adding items to folders. 
 BOOL LLFolderViewFolder::addItem(LLFolderViewItem* item)
 {
        items_t::iterator it = std::lower_bound(
                mItems.begin(),
                mItems.end(),
@@ -1945,18 +1912,29 @@ BOOL LLFolderViewFolder::addFolder(LLFolderViewFolder* folder)
        folder->setVisible(FALSE);
        addChild( folder );
        folder->dirtyFilter();
-        requestArrange();
+        // rearrange all descendants too, as our indentation level might have changed
+        folder->requestArrange(TRUE);
        return TRUE;
 }
-void LLFolderViewFolder::requestArrange()       
+void LLFolderViewFolder::requestArrange(BOOL include_descendants)       
 { 
        mLastArrangeGeneration = -1; 
        // flag all items up to root
-        if (mParentFolder)
+        if (mParentFolder && !mParentFolder->needsArrange())
        {
                mParentFolder->requestArrange();
        }
+        if (include_descendants)
+        {
+                for (folders_t::iterator iter = mFolders.begin();
+                        iter != mFolders.end();
+                        ++iter)
+                {
+                        (*iter)->requestArrange(TRUE);
+                }
+        }
 }
 void LLFolderViewFolder::toggleOpen()
@@ -2002,11 +1980,11 @@ void LLFolderViewFolder::setOpenArrangeRecursively(BOOL open, ERecurseType recur
 }
 BOOL LLFolderViewFolder::handleDragAndDropFromChild(MASK mask,
-                                                                                                        BOOL drop,
+                                                BOOL drop,
-                                                                                                        EDragAndDropType c_type,
+                                                EDragAndDropType c_type,
-                                                                                                        void* cargo_data,
+                                                void* cargo_data,
-                                                                                                        EAcceptance* accept,
+                                                EAcceptance* accept,
-                                                                                                        LLString& tooltip_msg)
+                                                LLString& tooltip_msg)
 {
        BOOL accepted = mListener && mListener->dragOrDrop(mask,drop,c_type,cargo_data);
        if (accepted) 
@@ -2218,16 +2196,13 @@ void LLFolderViewFolder::draw()
        }
        LLFolderViewItem::draw();
-        if( mIsOpen )
+        // draw children if root folder, or any other folder that is open or animating to closed state
+        if( getRoot() == this || (mIsOpen || mCurHeight != mTargetHeight ))
        {
                LLView::draw();
        }
-//      if (mExpanderHighlighted)
-//      {
-//              gl_rect_2d(mIndentation - TEXT_PAD, llfloor(mRect.getHeight() - TEXT_PAD), mIndentation + sFont->getWidth(mControlLabel) + TEXT_PAD, llfloor(mRect.getHeight() - sFont->getLineHeight() - TEXT_PAD), sFgColor, FALSE);
-//              //sFont->renderUTF8( mControlLabel, 0, mIndentation, llfloor(mRect.getHeight() - sFont->getLineHeight() - TEXT_PAD), sFgColor, LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, S32_MAX, S32_MAX, NULL, FALSE );
-//      }
        mExpanderHighlighted = FALSE;
 }
@@ -2237,6 +2212,16 @@ U32 LLFolderViewFolder::getCreationDate() const
 }
+BOOL    LLFolderViewFolder::potentiallyVisible()
+{
+        // folder should be visible by it's own filter status
+        return LLFolderViewItem::potentiallyVisible()   
+                 // or one or more of its descendants have passed the minimum filter requirement
+                || hasFilteredDescendants(mRoot->getFilter()->getMinRequiredGeneration())
+                // or not all of its descendants have been checked against minimum filter requirement
+                || getCompletedFilterGeneration() < getRoot()->getFilter()->getMinRequiredGeneration(); 
+}
 // this does prefix traversal, as folders are listed above their contents
 LLFolderViewItem* LLFolderViewFolder::getNextFromChild( LLFolderViewItem* item, BOOL include_children )
 {
@@ -2456,20 +2441,20 @@ LLFolderViewItem* LLFolderViewFolder::getPreviousFromChild( LLFolderViewItem* it
 class LLSetItemSortFunction : public LLFolderViewFunctor
 {
 public:
-        LLSetItemSortFunction(sort_order_f ordering)
+        LLSetItemSortFunction(U32 ordering)
-                : mSortFunction(ordering) {}
+                : mSortOrder(ordering) {}
        virtual ~LLSetItemSortFunction() {}
        virtual void doFolder(LLFolderViewFolder* folder);
        virtual void doItem(LLFolderViewItem* item);
-        sort_order_f mSortFunction;
+        U32 mSortOrder;
 };
 // Set the sort order.
 void LLSetItemSortFunction::doFolder(LLFolderViewFolder* folder)
 {
-        folder->setItemSortFunction(mSortFunction);
+        folder->setItemSortOrder(mSortOrder);
 }
 // Do nothing.
@@ -2696,6 +2681,7 @@ BOOL LLFolderView::addFolder( LLFolderViewFolder* folder)
        folder->setVisible(FALSE);
        addChild( folder );
        folder->dirtyFilter();
+        folder->requestArrange();
        return TRUE;
 }
@@ -2916,8 +2902,8 @@ BOOL LLFolderView::setSelection(LLFolderViewItem* selection, BOOL open,		/* Flaw
                addToSelectionList(selection);
        }
-        BOOL rv = LLFolderViewFolder::setSelection(selection, open, take_keyboard_focus);               /* Flawfinder: ignore */
+        BOOL rv = LLFolderViewFolder::setSelection(selection, open, take_keyboard_focus);
-        if(open)                /* Flawfinder: ignore */
+        if(open && selection)
        {
                selection->getParentFolder()->requestArrange();
        }
@@ -2954,11 +2940,6 @@ BOOL LLFolderView::changeSelection(LLFolderViewItem* selection, BOOL selected)
        }
        BOOL on_list = (item_iter != mSelectedItems.end());
-        if (on_list && mSelectedItems.size() == 1)
-        {
-                // we are trying to select/deselect the only selected item
-                return FALSE;
-        }
        if(selected && !on_list)
        {
@@ -3005,48 +2986,46 @@ S32 LLFolderView::extendSelection(LLFolderViewItem* selection, LLFolderViewItem*
 void LLFolderView::sanitizeSelection()
 {
+        // store off current item in case it is automatically deselected
+        // and we want to preserve context
+        LLFolderViewItem* original_selected_item = getCurSelectedItem();
+        
        std::vector<LLFolderViewItem*> items_to_remove;
        selected_items_t::iterator item_iter;
        for (item_iter = mSelectedItems.begin(); item_iter != mSelectedItems.end(); ++item_iter)
        {
                LLFolderViewItem* item = *item_iter;
-                BOOL visible = item->getVisible();
+                // ensure that each ancestor is open and potentially passes filtering
+                BOOL visible = item->potentiallyVisible(); // initialize from filter state for this item
+                // modify with parent open and filters states
                LLFolderViewFolder* parent_folder = item->getParentFolder();
-                while(visible && parent_folder)
+                while(parent_folder)
                {
-                        visible = visible && parent_folder->isOpen() && parent_folder->getVisible();
+                        visible = visible && parent_folder->isOpen() && parent_folder->potentiallyVisible();
                        parent_folder = parent_folder->getParentFolder();
                }
-                if (!visible || item->getNumSelectedDescendants() > 0)
+                //  deselect item if any ancestor is closed or didn't pass filter requirements.
+                if (!visible)
                {
-                        // only deselect self if not visible
+                        items_to_remove.push_back(item);
-                        // check to see if item failed the filter but was checked against most recent generation
+                }
-                        if ((!item->getFiltered() && item->getLastFilterGeneration() >= getFilter()->getMinRequiredGeneration())
-                                || (item->getParentFolder() && !item->getParentFolder()->isOpen()))
-                        {
-                                item->recursiveDeselect(TRUE);
-                                items_to_remove.push_back(item);
-                        }
-                        else
-                        {
-                                item->recursiveDeselect(FALSE);
-                        }
-                        selected_items_t::iterator other_item_iter;
+                // disallow nested selections (i.e. folder items plus one or more ancestors)
-                        for (other_item_iter = mSelectedItems.begin(); other_item_iter != mSelectedItems.end(); ++other_item_iter)
+                // could check cached mum selections count and only iterate if there are any
+                // but that may be a premature optimization.
+                selected_items_t::iterator other_item_iter;
+                for (other_item_iter = mSelectedItems.begin(); other_item_iter != mSelectedItems.end(); ++other_item_iter)
+                {
+                        LLFolderViewItem* other_item = *other_item_iter;
+                        for(LLFolderViewFolder* parent_folder = other_item->getParentFolder(); parent_folder; parent_folder = parent_folder->getParentFolder())
                        {
-                                LLFolderViewItem* other_item = *other_item_iter;
+                                if (parent_folder == item)
-                                LLFolderViewFolder* parent_folder = other_item->getParentFolder();
-                                while (parent_folder)
                                {
-                                        if (parent_folder == item)
+                                        // this is a descendent of the current folder, remove from list
-                                        {
+                                        items_to_remove.push_back(other_item);
-                                                // this is a descendent of the current folder, remove from list
+                                        break;
-                                                items_to_remove.push_back(other_item);
-                                                break;
-                                        }
-                                        parent_folder = parent_folder->getParentFolder();
                                }
                        }
                }
@@ -3055,7 +3034,47 @@ void LLFolderView::sanitizeSelection()
        std::vector<LLFolderViewItem*>::iterator item_it;
        for (item_it = items_to_remove.begin(); item_it != items_to_remove.end(); ++item_it )
        {
-                removeFromSelectionList(*item_it);
+                changeSelection(*item_it, FALSE); // toggle selection (also removes from list)
+        }
+        // if nothing selected after prior constraints...
+        if (mSelectedItems.empty())
+        {
+                // ...select first available parent of original selection, or "My Inventory" otherwise
+                LLFolderViewItem* new_selection = NULL;
+                if (original_selected_item)
+                {
+                        for(LLFolderViewFolder* parent_folder = original_selected_item->getParentFolder();
+                                parent_folder;
+                                parent_folder = parent_folder->getParentFolder())
+                        {
+                                if (parent_folder->potentiallyVisible())
+                                {
+                                        // give initial selection to first ancestor folder that potentially passes the filter
+                                        if (!new_selection)
+                                        {
+                                                new_selection = parent_folder;
+                                        }
+                                        // if any ancestor folder of original item is closed, move the selection up 
+                                        // to the highest closed
+                                        if (!parent_folder->isOpen())
+                                        {       
+                                                new_selection = parent_folder;
+                                        }
+                                }
+                        }
+                }
+                else
+                {
+                        // nothing selected to start with, so pick "My Inventory" as best guess
+                        new_selection = getItemByID(gAgent.getInventoryRootID());
+                }
+                if (new_selection)
+                {
+                        setSelection(new_selection, FALSE, FALSE);
+                }
        }
 }
@@ -3232,7 +3251,7 @@ void LLFolderView::removeSelectedItems( void )
                // create a temporary structure which we will use to remove
                // items, since the removal will futz with internal data
                // structures.
-                LLDynamicArray<LLFolderViewItem*> items;
+                std::vector<LLFolderViewItem*> items;
                S32 count = mSelectedItems.size();
                if(count == 0) return;
                LLFolderViewItem* item = NULL;
@@ -3242,7 +3261,7 @@ void LLFolderView::removeSelectedItems( void )
                        item = *item_it;
                        if(item->isRemovable())
                        {
-                                items.put(item);
+                                items.push_back(item);
                        }
                        else
                        {
@@ -3252,11 +3271,11 @@ void LLFolderView::removeSelectedItems( void )
                }
                // iterate through the new container.
-                count = items.count();
+                count = items.size();
                LLUUID new_selection_id;
                if(count == 1)
                {
-                        LLFolderViewItem* item_to_delete = items.get(0);
+                        LLFolderViewItem* item_to_delete = items[0];
                        LLFolderViewFolder* parent = item_to_delete->getParentFolder();
                        LLFolderViewItem* new_selection = item_to_delete->getNextOpenNode(FALSE);
                        if (!new_selection)
@@ -3284,7 +3303,7 @@ void LLFolderView::removeSelectedItems( void )
                {
                        LLDynamicArray<LLFolderViewEventListener*> listeners;
                        LLFolderViewEventListener* listener;
-                        LLFolderViewItem* last_item = items.get(count - 1);
+                        LLFolderViewItem* last_item = items[count - 1];
                        LLFolderViewItem* new_selection = last_item->getNextOpenNode(FALSE);
                        while(new_selection && new_selection->isSelected())
                        {
@@ -3309,7 +3328,7 @@ void LLFolderView::removeSelectedItems( void )
                        for(S32 i = 0; i < count; ++i)
                        {
-                                listener = items.get(i)->getListener();
+                                listener = items[i]->getListener();
                                if(listener && (listeners.find(listener) == LLDynamicArray<LLFolderViewEventListener*>::FAIL))
                                {
                                        listeners.put(listener);
@@ -3620,21 +3639,6 @@ void LLFolderView::setFocus(BOOL focus)
 {
        if (focus)
        {
-                // select "My Inventory" if nothing selected
-                if (!getCurSelectedItem())
-                {
-                        LLFolderViewItem* itemp = getItemByID(gAgent.getInventoryRootID());
-                        if (itemp)
-                        {
-                                setSelection(itemp, FALSE, FALSE);
-                        }
-                }
-                if (mRenamer->getVisible())
-                {
-                        //RN: commit rename changes when focus is moved, only revert on ESC
-                        finishRenamingItem();
-                }
                if(!hasFocus())
                {
                        gEditMenuHandler = this;
@@ -3954,10 +3958,10 @@ BOOL LLFolderView::search(LLFolderViewItem* first_item, const LLString &search_s
        LLString::toUpper(upper_case_string);
        // if nothing selected, select first item in folder
-        if (!first_item)
+        if (!search_item)
        {
                // start from first item
-                first_item = getNextFromChild(NULL);
+                search_item = getNextFromChild(NULL);
        }
        // search over all open nodes for first substring match (with wrapping)
@@ -4248,8 +4252,6 @@ void LLFolderView::idle(void* user_data)
        // filter to determine visiblity before arranging
        self->filterFromRoot();
-        self->sanitizeSelection();
        // automatically show matching items, and select first one
        // do this every frame until user puts keyboard focus into the inventory window
        // signaling the end of the automatic update
@@ -4269,6 +4271,8 @@ void LLFolderView::idle(void* user_data)
                self->scrollToShowSelection();
        }
+        self->sanitizeSelection();
        if( self->needsArrange() && self->isInVisibleChain())
        {
                self->arrangeFromRoot();
@@ -4307,33 +4311,71 @@ void LLFolderView::dumpSelectionInformation()
 ///----------------------------------------------------------------------------
 /// Local function definitions
 ///----------------------------------------------------------------------------
+bool LLInventorySort::updateSort(U32 order)
-bool sort_item_name(LLFolderViewItem* a, LLFolderViewItem* b)
 {
-        S32 compare = LLString::compareDict(a->getLabel(), b->getLabel());
+        if (order != mSortOrder)
-        if (0 == compare)
-        {
-                return (a->getCreationDate() > b->getCreationDate());
-        }
-        else
        {
-                return (compare < 0);
+                mSortOrder = order;
+                mByDate = (order & LLInventoryFilter::SO_DATE);
+                mSystemToTop = (order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP);
+                mFoldersByName = (order & LLInventoryFilter::SO_FOLDERS_BY_NAME);
+                return true;
        }
+        return false;
 }
-// BUG: This is very very slow.  The getCreationDate() is log n in number
+bool LLInventorySort::operator()(LLFolderViewItem* a, LLFolderViewItem* b)
-// of inventory items.
-bool sort_item_date(LLFolderViewItem* a, LLFolderViewItem* b)
 {
-        U32 first_create = a->getCreationDate();
+        // We sort by name if we aren't sorting by date
-        U32 second_create = b->getCreationDate();
+        // OR if these are folders and we are sorting folders by name.
-        if (first_create == second_create)
+        bool by_name = (!mByDate 
+                                        || (mFoldersByName 
+                                                && (a->getSortGroup() != SG_ITEM)));
+        
+        if (a->getSortGroup() != b->getSortGroup())
+        {
+                if (mSystemToTop)
+                {
+                        // Group order is System Folders, Trash, Normal Folders, Items
+                        return (a->getSortGroup() < b->getSortGroup());
+                }
+                else if (mByDate)
+                {
+                        // Trash needs to go to the bottom if we are sorting by date
+                        if ( (a->getSortGroup() == SG_TRASH_FOLDER)
+                                || (b->getSortGroup() == SG_TRASH_FOLDER))
+                        {
+                                return (b->getSortGroup() == SG_TRASH_FOLDER);
+                        }
+                }
+        }
+        if (by_name)
        {
-                return (LLString::compareDict(a->getLabel(), b->getLabel()) < 0);
+                S32 compare = LLString::compareDict(a->getLabel(), b->getLabel());
+                if (0 == compare)
+                {
+                        return (a->getCreationDate() > b->getCreationDate());
+                }
+                else
+                {
+                        return (compare < 0);
+                }
        }
        else
        {
-                return (first_create > second_create);
+                // 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();
+                if (first_create == second_create)
+                {
+                        return (LLString::compareDict(a->getLabel(), b->getLabel()) < 0);
+                }
+                else
+                {
+                        return (first_create > second_create);
+                }
        }
 }
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index 8acbc8f..ec70b90 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -181,6 +181,7 @@ public:
        static const U32 SO_DATE = 1;
        static const U32 SO_FOLDERS_BY_NAME = 2;
+        static const U32 SO_SYSTEM_FOLDERS_TO_TOP = 4;
        LLInventoryFilter(const LLString& name);
        virtual ~LLInventoryFilter();
@@ -265,6 +266,34 @@ private:
        LLString mFilterText;
 };
+// These are grouping of inventory types.
+// Order matters when sorting system folders to the top.
+enum EInventorySortGroup
+{ 
+        SG_SYSTEM_FOLDER, 
+        SG_TRASH_FOLDER, 
+        SG_NORMAL_FOLDER, 
+        SG_ITEM 
+};
+class LLInventorySort
+{
+public:
+        LLInventorySort() 
+                : mSortOrder(0) { }
+        
+        // Returns true if order has changed
+        bool updateSort(U32 order);
+        U32 getSort() { return mSortOrder; }
+        bool operator()(LLFolderViewItem* a, LLFolderViewItem* b);
+private:
+        U32  mSortOrder;
+        bool mByDate;
+        bool mSystemToTop;
+        bool mFoldersByName;
+};
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLFolderViewItem
 //
@@ -351,6 +380,8 @@ public:
        enum { ARRANGE = TRUE, DO_NOT_ARRANGE = FALSE };
        virtual BOOL addToFolder(LLFolderViewFolder* folder, LLFolderView* root);
+        virtual EInventorySortGroup getSortGroup();
        // Finds width and height of this object and it's children.  Also
        // makes sure that this view and it's children are the right size.
        virtual S32 arrange( S32* width, S32* height, S32 filter_generation );
@@ -449,8 +480,10 @@ public:
        virtual void setStatusText(const LLString& text) { mStatusText = text; }
-        BOOL                    getFiltered();
+        virtual BOOL    potentiallyVisible(); // do we know for a fact that this item has been filtered out?
-        BOOL                    getFiltered(S32 filter_generation);
+        virtual BOOL    getFiltered();
+        virtual BOOL    getFiltered(S32 filter_generation);
        virtual void    setFiltered(BOOL filtered, S32 filter_generation);
        // change the icon
@@ -504,7 +537,7 @@ protected:
        typedef std::vector<LLFolderViewFolder*> folders_t;
        items_t mItems;
        folders_t mFolders;
-        sort_order_f mSortFunction;
+        LLInventorySort mSortFunction;
        BOOL            mIsOpen;
        BOOL            mExpanderHighlighted;
@@ -534,6 +567,8 @@ public:
        virtual EWidgetType getWidgetType() const;
        virtual LLString getWidgetTag() const;
+        virtual BOOL    potentiallyVisible();
        LLFolderViewItem* getNextFromChild( LLFolderViewItem*, BOOL include_children = TRUE );
        LLFolderViewItem* getPreviousFromChild( LLFolderViewItem*, BOOL include_children = TRUE  );
@@ -546,6 +581,9 @@ public:
        BOOL needsArrange();
+        // Returns the sort group (system, trash, folder) for this folder.
+        virtual EInventorySortGroup getSortGroup();
        virtual void    setCompletedFilterGeneration(S32 generation, BOOL recurse_up);
        virtual S32             getCompletedFilterGeneration() { return mCompletedFilterGeneration; }
@@ -603,7 +641,7 @@ public:
        // This function is called by a child that needs to be resorted.
        void resort(LLFolderViewItem* item);
-        void setItemSortFunction(sort_order_f ordering);
+        void setItemSortOrder(U32 ordering);
        void sortBy(U32);
        //BOOL (*func)(LLFolderViewItem* a, LLFolderViewItem* b));
@@ -617,7 +655,8 @@ public:
        virtual void setOpen(BOOL open = TRUE);         /* Flawfinder: ignore */
        // Called when a child is refreshed.
-        virtual void requestArrange();
+        // don't rearrange child folder contents unless explicitly requested
+        virtual void requestArrange(BOOL include_descendants = FALSE);
        // internal method which doesn't update the entire view. This
        // method was written because the list iterators destroy the state
diff --git a/linden/indra/newview/llgenepool.cpp b/linden/indra/newview/llgenepool.cpp
index 95b15f3..3cc57e9 100644
--- a/linden/indra/newview/llgenepool.cpp
+++ b/linden/indra/newview/llgenepool.cpp
@@ -223,6 +223,14 @@ void LLGenePool::spawn( EWearableType type )
        // Only consider archetypes that have the same sex as you have already.
        LLVisualParam* male_param = avatar->getVisualParam( "male" );
+        if (!male_param)
+        {
+                llwarns << "The hard coded \'male\' parameter passed to avatar->getVisualParam() in LLGenePool::spawn() is no longer valid."
+                                << llendl;
+                return;
+        }
        S32 male_param_id = male_param->getID();
        F32 sex_weight = male_param->getWeight();
diff --git a/linden/indra/newview/llgivemoney.cpp b/linden/indra/newview/llgivemoney.cpp
index 3722682..e89ab3d 100644
--- a/linden/indra/newview/llgivemoney.cpp
+++ b/linden/indra/newview/llgivemoney.cpp
@@ -155,7 +155,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
        
        childSetKeystrokeCallback("amount", &LLFloaterPay::onKeystroke, this);
        childSetText("amount", last_amount);
-        childSetPrevalidate("amount", LLLineEditor::prevalidatePositiveS32);
+        childSetPrevalidate("amount", LLLineEditor::prevalidateNonNegativeS32);
        info = new LLGiveMoneyInfo(this, 0);
        mCallbackData.push_back(info);
@@ -422,14 +422,9 @@ void LLFloaterPay::onKeystroke(LLLineEditor*, void* data)
        LLFloaterPay* self = reinterpret_cast<LLFloaterPay*>(data);
        if(self)
        {
-                if (!self->childGetText("amount").empty())
+                // enable the Pay button when amount is non-empty and positive, disable otherwise
-                {
+                LLString amtstr = self->childGetText("amount");
-                        self->childSetEnabled("pay btn", TRUE);
+                self->childSetEnabled("pay btn", !amtstr.empty() && atoi(amtstr.c_str()) > 0);
-                }
-                else
-                {
-                        self->childSetEnabled("pay btn", FALSE);
-                }
        }
 }
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index e14cebe..81806dc 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -1134,5 +1134,5 @@ void post_show_depth_buffer()
        }
        glDrawPixels(xsize,ysize,GL_RED,GL_UNSIGNED_BYTE,buf);
-        delete buf;
+        delete [] buf;
 }
diff --git a/linden/indra/newview/llglslshader.cpp b/linden/indra/newview/llglslshader.cpp
index 3f23a66..9c3d707 100644
--- a/linden/indra/newview/llglslshader.cpp
+++ b/linden/indra/newview/llglslshader.cpp
@@ -847,7 +847,7 @@ BOOL LLShaderMgr::loadShadersAvatar()
                return FALSE;
        }
        
-        if (success)
+        /*if (success)
        {
                //load specular (eyeball) vertex program
                std::string eyeballvertex = "avatar/eyeballV.glsl";
@@ -865,7 +865,7 @@ BOOL LLShaderMgr::loadShadersAvatar()
                {
                        llwarns << "Failed to load " << eyeballvertex << llendl;
                }
-        }
+        }*/
        if (success)
        {
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index de9b571..ef20138 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -162,7 +162,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
        line = new LLTextBox("title",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),"Group Notice",LLFontGL::sSansSerifHuge);
        line->setHAlign(LLFontGL::RIGHT);
-        line->setDropshadowVisible(true);
+        line->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
        line->setBorderVisible(FALSE);
        line->setColor(LLColor4::white);
        line->setBackgroundColor( gColors.getColor("GroupNotifyBoxColor") );
@@ -177,7 +177,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
        from << "Sent by " << from_name << ", " << group_name;
        line = new LLTextBox("group",LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),from.str().c_str(),LLFontGL::sSansSerif);
-        line->setDropshadowVisible(true);
+        line->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
        line->setHAlign(LLFontGL::RIGHT);
        line->setBorderVisible(FALSE);
        line->setColor(LLColor4::white);
@@ -244,7 +244,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
                        line = new LLTextBox("subjecttitle",LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),"Attached: ",LLFontGL::sSansSerif);
                        line->setBorderVisible(FALSE);
                        line->setColor(LLColor4::white);
-                        line->setDropshadowVisible(TRUE);
+                        line->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
                        line->setBackgroundColor( gColors.getColor("GroupNotifyBoxColor") );
                        addChild(line);
@@ -261,7 +261,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const char* subject,
                        line->setEnabled(FALSE);
                        line->setBorderVisible(TRUE);
                        line->setDisabledColor(LLColor4::blue4);
-                        line->setDropshadowVisible(FALSE);
+                        line->setFontStyle(LLFontGL::NORMAL);
                        line->setBackgroundVisible(true);
                        line->setBackgroundColor( semi_transparent );
                        addChild(line);
@@ -399,7 +399,7 @@ void LLGroupNotifyBox::close()
        // Then we need to send the inventory declined message
        if(mHasInventory)
        {
-                inventory_offer_callback( 1 , mInventoryOffer); 
+                inventory_offer_callback(IOR_DECLINE , mInventoryOffer); 
        }
        gNotifyBoxView->removeChild(this);
@@ -461,7 +461,7 @@ void LLGroupNotifyBox::onClickSaveInventory(void* data)
 {
        LLGroupNotifyBox* self = (LLGroupNotifyBox*)data;
-        inventory_offer_callback( 0 , self->mInventoryOffer); 
+        inventory_offer_callback( IOR_ACCEPT , self->mInventoryOffer); 
        // inventory_offer_callback will delete the offer, so make sure we aren't still pointing to it.
        self->mInventoryOffer = NULL;
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 6807b42..8296e14 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -539,7 +539,6 @@ void LLHoverView::updateText()
                        // on the land info panel
                        if ( !hover_parcel->getAllowModify() )
                        {
-                                if (words) line->append(", ");
                                if ( hover_parcel->getAllowGroupModify() )
                                {
                                        line->append("Group Build");
diff --git a/linden/indra/newview/llhudeffecttrail.cpp b/linden/indra/newview/llhudeffecttrail.cpp
index fed3a9e..79c05d7 100644
--- a/linden/indra/newview/llhudeffecttrail.cpp
+++ b/linden/indra/newview/llhudeffecttrail.cpp
@@ -112,17 +112,19 @@ void LLHUDEffectSpiral::packData(LLMessageSystem *mesgsys)
 void LLHUDEffectSpiral::unpackData(LLMessageSystem *mesgsys, S32 blocknum)
 {
-        U8 packed_data[56];
+        const size_t EFFECT_SIZE = 56;
+        U8 packed_data[EFFECT_SIZE];
        LLHUDEffect::unpackData(mesgsys, blocknum);
        LLUUID object_id, target_object_id;
        S32 size = mesgsys->getSizeFast(_PREHASH_Effect, blocknum, _PREHASH_TypeData);
-        if (size != 56)
+        if (size != EFFECT_SIZE)
        {
                llwarns << "Spiral effect with bad size " << size << llendl;
                return;
        }
-        mesgsys->getBinaryDataFast(_PREHASH_Effect, _PREHASH_TypeData, packed_data, 56, blocknum);
+        mesgsys->getBinaryDataFast(_PREHASH_Effect, _PREHASH_TypeData, 
+                packed_data, EFFECT_SIZE, blocknum, EFFECT_SIZE);
        
        htonmemcpy(object_id.mData, packed_data, MVT_LLUUID, 16);
        htonmemcpy(target_object_id.mData, packed_data + 16, MVT_LLUUID, 16);
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index 38471ad..02578d2 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -374,11 +374,21 @@ void LLIMView::addMessage(
        }
        else
        {
+                //if we have recently requsted to be dropped from a session
+                //but are still receiving messages from the session, don't make
+                //a new floater
+//              if ( mSessionsDropRequested.has(session_id.asString()) )
+//              {
+//                      return ;
+//              }
                const char* name = from;
                if(session_name && (strlen(session_name)>1))
                {
                        name = session_name;
                }
+                
                floater = createFloater(new_session_id, other_participant_id, name, dialog, FALSE);
                // When we get a new IM, and if you are a god, display a bit
@@ -502,13 +512,17 @@ LLUUID LLIMView::addSession(const std::string& name,
        LLFloaterIMPanel* floater = findFloaterBySession(session_id);
        if(!floater)
        {
-                // On creation, use the first element of ids as the "other_participant_id"
+                // On creation, use the first element of ids as the
+                // "other_participant_id"
                floater = createFloater(session_id,
                                                                other_participant_id,
                                                                name,
                                                                ids,
                                                                dialog,
                                                                TRUE);
+                if ( !floater ) return LLUUID::null;
                noteOfflineUsers(floater, ids);
        }
        mTalkFloater->showFloater(floater);
@@ -528,6 +542,11 @@ void LLIMView::removeSession(const LLUUID& session_id)
                mTalkFloater->removeFloater(floater);
                //mTabContainer->removeTabPanel(floater);
        }
+//      if ( session_id.notNull() )
+//      {
+//              mSessionsDropRequested[session_id.asString()] = LLSD();
+//      }
 }
 void LLIMView::refresh()
@@ -705,6 +724,7 @@ LLFloaterIMPanel* LLIMView::createFloater(
        {
                llwarns << "Creating LLFloaterIMPanel with null session ID" << llendl;
        }
        llinfos << "LLIMView::createFloater: from " << other_participant_id 
                        << " in session " << session_id << llendl;
        LLFloaterIMPanel* floater = new LLFloaterIMPanel(session_label,
@@ -731,6 +751,7 @@ LLFloaterIMPanel* LLIMView::createFloater(
        {
                llwarns << "Creating LLFloaterIMPanel with null session ID" << llendl;
        }
        llinfos << "LLIMView::createFloater: from " << other_participant_id 
                        << " in session " << session_id << llendl;
        LLFloaterIMPanel* floater = new LLFloaterIMPanel(session_label,
@@ -805,6 +826,11 @@ void LLIMView::updateFloaterSessionID(const LLUUID& old_session_id,
        }
 }
+void LLIMView::onDropRequestReplyReceived(const LLUUID& session_id)
+{
+        mSessionsDropRequested.erase(session_id.asString());
+}
 void onConfirmForceCloseError(S32 option, void* data)
 {
        //only 1 option really
@@ -869,7 +895,7 @@ public:
 class LLViewerIMSessionEventReply : public LLHTTPNode
 {
-        public:
+public:
        virtual void describe(Description& desc) const
        {
                desc.shortInfo("Used for receiving a reply to a IM session event");
@@ -913,7 +939,7 @@ class LLViewerIMSessionEventReply : public LLHTTPNode
 class LLViewerForceCloseIMSession: public LLHTTPNode
 {
+public:
        virtual void post(ResponsePtr response,
                                          const LLSD& context,
                                          const LLSD& input) const
@@ -942,11 +968,40 @@ class LLViewerForceCloseIMSession: public LLHTTPNode
        }
 };
+class LLViewerIMSessionDropReply : public LLHTTPNode
+{
+public:
+        virtual void post(ResponsePtr response,
+                                          const LLSD& context,
+                                          const LLSD& input) const
+        {
+                LLUUID session_id;
+                bool success;
+                success = input["body"]["success"].asBoolean();
+                session_id = input["body"]["session_id"].asUUID();
+                if ( !success )
+                {
+                        //throw an error alert?
+                }
+                gIMView->onDropRequestReplyReceived(session_id);
+        }
+};
 LLHTTPRegistration<LLViewerIMSessionStartReply>
-   gHTTPRegistrationMessageImsessionstartreply("/message/IMSessionStartReply");
+   gHTTPRegistrationMessageImsessionstartreply(
+           "/message/IMSessionStartReply");
 LLHTTPRegistration<LLViewerIMSessionEventReply>
-   gHTTPRegistrationMessageImsessioneventreply("/message/IMSessionEventReply");
+   gHTTPRegistrationMessageImsessioneventreply(
+           "/message/IMSessionEventReply");
 LLHTTPRegistration<LLViewerForceCloseIMSession>
-    gHTTPRegistrationMessageForceCloseImSession("/message/ForceCloseIMSession");
+    gHTTPRegistrationMessageForceCloseImSession(
+                "/message/ForceCloseIMSession");
+LLHTTPRegistration<LLViewerIMSessionDropReply>
+    gHTTPRegistrationMessageImSessionDropReply(
+                "/message/IMSessionDropReply");
diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h
index 74ea880..c0b0f79 100644
--- a/linden/indra/newview/llimview.h
+++ b/linden/indra/newview/llimview.h
@@ -131,6 +131,8 @@ public:
        // is no matching panel.
        LLFloaterIMPanel* findFloaterBySession(const LLUUID& session_id);
+        void onDropRequestReplyReceived(const LLUUID& session_id);
 private:
        // create a panel and update internal representation for
        // consistency. Returns the pointer, caller (the class instance
@@ -167,6 +169,8 @@ private:
        // An IM has been received that you haven't seen yet.
        BOOL mIMReceived;
+        LLSD mSessionsDropRequested;
 };
diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp
index 6452c87..900a729 100644
--- a/linden/indra/newview/llinventoryactions.cpp
+++ b/linden/indra/newview/llinventoryactions.cpp
@@ -491,6 +491,23 @@ class LLSetSortBy : public inventory_listener_t
                        }
                        mPtr->getActivePanel()->setSortOrder( order );
                }
+                else if (sort_field == "systemfolderstotop")
+                {
+                        U32 order = mPtr->getActivePanel()->getSortOrder();
+                        if ( order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP )
+                        {
+                                order &= ~LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP;
+                                mPtr->getControl("Inventory.SystemFoldersToTop")->setValue( FALSE );
+                        }
+                        else
+                        {
+                                order |= LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP;
+                                mPtr->getControl("Inventory.SystemFoldersToTop")->setValue( TRUE );
+                        }
+                        mPtr->getActivePanel()->setSortOrder( order );
+                }
                return true;
        }
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 05334d7..a7b80ae 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -569,10 +569,10 @@ const char* safe_inv_type_lookup(LLInventoryType::EType inv_type)
 }
 LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type,
-                                                                                   LLInventoryType::EType inv_type,
+                                           LLInventoryType::EType inv_type,
-                                                                                   LLInventoryPanel* inventory,
+                                           LLInventoryPanel* inventory,
-                                                                                   const LLUUID& uuid,
+                                           const LLUUID& uuid,
-                                                                                   U32 flags)
+                                           U32 flags)
 {
        LLInvFVBridge* new_listener = NULL;
        switch(asset_type)
@@ -677,7 +677,11 @@ LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type,
                break;
        }
-        new_listener->mInvType = inv_type;
+        if (new_listener)
+        {
+                new_listener->mInvType = inv_type;
+        }
        return new_listener;
 }
@@ -907,16 +911,20 @@ BOOL LLItemBridge::removeItem()
        if(!model) return FALSE;
        LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
        LLViewerInventoryItem* item = getItem();
-        if(item)
+        // if item is not already in trash
+        if(item && !model->isObjectDescendentOf(mUUID, trash_id))
        {
-                // restamp on move to trash.
+                // move to trash, and restamp
                LLInvFVBridge::changeItemParent(model, item, trash_id, TRUE);
+                // delete was successful
+                return TRUE;
+        }
+        else
+        {
+                // tried to delete already item in trash (should purge?)
+                return FALSE;
        }
-        // return false anyway, so that if it's called from the folder
-        // view, it doesn't remove the view - it's just being moved to the
-        // trash.
-        return FALSE;
 }
 BOOL LLItemBridge::isItemCopyable() const
@@ -1462,11 +1470,20 @@ void LLInventoryCopyAndWearObserver::changed(U32 mask)
                {
                        LLViewerInventoryCategory* category = gInventory.getCategory(mCatID);
-                        if (category->getDescendentCount() == mContentsCount)
+                        if (NULL == category)
                        {
-                                gInventory.removeObserver(this);
+                                llwarns << "gInventory.getCategory(" << mCatID
-                                wear_inventory_category(category, FALSE, TRUE);
+                                        << ") was NULL" << llendl;
-                                delete this;
+                        }
+                        else
+                        {
+                                if (category->getDescendentCount() ==
+                                    mContentsCount)
+                                {
+                                        gInventory.removeObserver(this);
+                                        wear_inventory_category(category, FALSE, TRUE);
+                                        delete this;
+                                }
                        }               
                }
@@ -1682,11 +1699,7 @@ BOOL LLFolderBridge::removeItem()
                LLInvFVBridge::changeCategoryParent(model, cat, trash_id, TRUE);
        }
-        // return false anyway, so that if it's called from the folder
+        return TRUE;
-        // view, it doesn't remove the view - it's just being moved to the
-        // trash.
-        return FALSE;
 }
 BOOL LLFolderBridge::isClipboardPasteable() const
@@ -2178,10 +2191,13 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
                        // everything in the active window so that we don't follow
                        // the selection to its new location (which is very
                        // annoying).
-                        LLInventoryPanel* active_panel = LLInventoryView::getActiveInventory()->getPanel();
+                        if (LLInventoryView::getActiveInventory())
-                        if (mInventoryPanel != active_panel)
                        {
-                                active_panel->unSelectAll();
+                                LLInventoryPanel* active_panel = LLInventoryView::getActiveInventory()->getPanel();
+                                if (active_panel && (mInventoryPanel != active_panel))
+                                {
+                                        active_panel->unSelectAll();
+                                }
                        }
                        // restamp if the move is into the trash.
@@ -3117,7 +3133,16 @@ void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model
                        gMessageSystem->sendReliable( gAgent.getRegion()->getHost() );
                }
                // this object might have been selected, so let the selection manager know it's gone now
-                gSelectMgr->remove(gObjectList.findObject(item->getUUID()));
+                LLViewerObject *found_obj =
+                        gObjectList.findObject(item->getUUID());
+                if (found_obj)
+                {
+                        gSelectMgr->remove(found_obj);
+                }
+                else
+                {
+                        llwarns << "object not found - ignoring" << llendl;
+                }
        }
        else LLItemBridge::performAction(folder, model, action);
 }
@@ -4027,7 +4052,15 @@ void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata)
                                gMessageSystem->sendReliable( gAgent.getRegion()->getHost() );
                                // this object might have been selected, so let the selection manager know it's gone now
-                                gSelectMgr->remove(gObjectList.findObject( obj_item_array.get(i)->getUUID()) );
+                                LLViewerObject *found_obj = gObjectList.findObject( obj_item_array.get(i)->getUUID());
+                                if (found_obj)
+                                {
+                                        gSelectMgr->remove(found_obj);
+                                }
+                                else
+                                {
+                                        llwarns << "object not found, ignoring" << llendl;
+                                }
                        }
                }
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index 1269fa2..1269fa2 100755..100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index ddd229b..8e95156 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -27,6 +27,7 @@
 */
 #include "llviewerprecompiledheaders.h"
 #include "llinventorymodel.h"
 #include "llassetstorage.h"
@@ -41,6 +42,7 @@
 #include "llfocusmgr.h"
 #include "llinventoryview.h"
 #include "llviewerinventory.h"
+#include "llviewermessage.h"
 #include "llviewerwindow.h"
 #include "viewer.h"
 #include "lldbstrings.h"
@@ -2282,7 +2284,7 @@ void LLInventoryModel::processUseCachedInventory(LLMessageSystem* msg, void**)
 void LLInventoryModel::processUpdateCreateInventoryItem(LLMessageSystem* msg, void**)
 {
        // do accounting and highlight new items if they arrive
-        if (gInventory.messageUpdateCore(msg, true, true))
+        if (gInventory.messageUpdateCore(msg, true))
        {
                U32 callback_id;
                LLUUID item_id;
@@ -2298,12 +2300,15 @@ void LLInventoryModel::processUpdateCreateInventoryItem(LLMessageSystem* msg, vo
 void LLInventoryModel::processFetchInventoryReply(LLMessageSystem* msg, void**)
 {
        // no accounting
-        gInventory.messageUpdateCore(msg, false, false);
+        gInventory.messageUpdateCore(msg, false);
 }
-bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account, bool highlight_new)
+bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account)
 {
+        //make sure our added inventory observer is active -Gigs
+        start_new_inventory_observer();
        LLUUID agent_id;
        msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
        if(agent_id != gAgent.getID())
@@ -2312,16 +2317,15 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account, boo
                                << llendl;
                return false;
        }
-        LLPointer<LLViewerInventoryItem> lastitem; // hack
        item_array_t items;
        update_map_t update;
        S32 count = msg->getNumberOfBlocksFast(_PREHASH_InventoryData);
        bool all_one_folder = true;
        LLUUID folder_id;
+        // Does this loop ever execute more than once? -Gigs
        for(S32 i = 0; i < count; ++i)
        {
                LLPointer<LLViewerInventoryItem> titem = new LLViewerInventoryItem;
-                lastitem = titem;
                titem->unpackMessage(msg, _PREHASH_InventoryData, i);
                lldebugs << "LLInventoryModel::messageUpdateCore() item id:"
                                 << titem->getUUID() << llendl;
@@ -2359,6 +2363,7 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account, boo
        }
        U32 changes = 0x0;
+        //as above, this loop never seems to loop more than once per call
        for (item_array_t::iterator it = items.begin(); it != items.end(); ++it)
        {
                changes |= gInventory.updateItem(*it);
@@ -2366,88 +2371,6 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account, boo
        gInventory.notifyObservers();
        gViewerWindow->getWindow()->decBusyCount();
-        // *HACK: Do the 'show' logic for a new item in the inventory if
-        // it is a newly created item.
-        if (highlight_new
-                && (changes & LLInventoryObserver::ADD) == LLInventoryObserver::ADD)
-        {
-                LLUUID trash_id;
-                trash_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH);
-                if(!gInventory.isObjectDescendentOf(lastitem->getUUID(), trash_id))
-                {
-                        LLMultiPreview* multi_previewp = LLMultiPreview::getAutoOpenInstance(folder_id);
-                        if (!multi_previewp && all_one_folder && count > 1)
-                        {
-                                S32 left, top;
-                                gFloaterView->getNewFloaterPosition(&left, &top);
-                                multi_previewp = new LLMultiPreview(LLRect(left, top, left + 300, top - 100));
-                                LLMultiPreview::setAutoOpenInstance(multi_previewp, folder_id);
-                        }
-                        LLFloater::setFloaterHost(multi_previewp);
-                        bool show_keep_discard = lastitem->getPermissions().getCreator() != gAgent.getID();
-                        switch(lastitem->getType())
-                        {
-                        case LLAssetType::AT_NOTECARD:
-                                open_notecard(
-                                        lastitem->getUUID(),
-                                        LLString("Note: ") + lastitem->getName(),
-                                        show_keep_discard,
-                                        LLUUID::null, 
-                                        FALSE);
-                                break;
-                        case LLAssetType::AT_LANDMARK:
-                                open_landmark(
-                                        lastitem->getUUID(),
-                                        LLString("  ") + lastitem->getName(),
-                                        show_keep_discard,
-                                        LLUUID::null,
-                                        FALSE);
-                                break;
-                        case LLAssetType::AT_TEXTURE:
-                                open_texture(
-                                        lastitem->getUUID(),
-                                        LLString("Texture: ") + lastitem->getName(),
-                                        show_keep_discard,
-                                        LLUUID::null, 
-                                        FALSE);
-                                break;
-                        default:
-                                break;
-                        }
-                        LLFloater::setFloaterHost(NULL);
-                        if (multi_previewp)
-                        {
-                                multi_previewp->open();
-                        }
-                        LLInventoryView* view = LLInventoryView::getActiveInventory();
-                        if(view)
-                        {
-                                LLUUID lost_and_found_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LOST_AND_FOUND);
-                                BOOL inventory_has_focus = gFocusMgr.childHasKeyboardFocus(view);
-                                BOOL user_is_away = gAwayTimer.getStarted();
-                                // don't select lost and found items if an active user is working in the inventory
-                                if (!gInventory.isObjectDescendentOf(lastitem->getUUID(), lost_and_found_id) ||
-                                        !inventory_has_focus ||
-                                        user_is_away)
-                                {
-                                        LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();     
-                                        LLFocusMgr::FocusLostCallback callback = gFocusMgr.getFocusCallback();   
-                                        view->getPanel()->setSelection(lastitem->getUUID(), TAKE_FOCUS_NO);
-                                        // HACK to open inventory offers that are
-                                        // accepted.  This information really needs to
-                                        // flow through the instant messages and
-                                        // inventory restore keyboard focus
-                                        gFocusMgr.setKeyboardFocus(focus_ctrl, callback);        
-                                }
-                        }
-                }
-        }
        return true;
 }
@@ -3452,6 +3375,43 @@ void LLInventoryExistenceObserver::changed(U32 mask)
        }
 }
+void LLInventoryAddedObserver::changed(U32 mask)
+{
+        if(!(mask & LLInventoryObserver::ADD))
+        {
+                return;
+        }
+        // *HACK: If this was in response to a packet off
+        // 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;
+        // We only want newly created inventory items. JC
+        if ( strcmp(msg_name, "UpdateCreateInventoryItem") )
+        {
+                return;
+        }
+        LLPointer<LLViewerInventoryItem> titem = new LLViewerInventoryItem;
+        S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_InventoryData);
+        for(S32 i = 0; i < num_blocks; ++i)
+        {
+                titem->unpackMessage(msg, _PREHASH_InventoryData, i);
+                if (!(titem->getUUID().isNull()))
+                {
+                        //we don't do anything with null keys
+                        mAdded.push_back(titem->getUUID());
+                }
+        }
+        if (!mAdded.empty())
+        {
+                done();
+        }
+}
 LLInventoryTransactionObserver::LLInventoryTransactionObserver(
        const LLTransactionID& transaction_id) :
        mTransactionID(transaction_id)
diff --git a/linden/indra/newview/llinventorymodel.h b/linden/indra/newview/llinventorymodel.h
index 9867842..78ab0e3 100644
--- a/linden/indra/newview/llinventorymodel.h
+++ b/linden/indra/newview/llinventorymodel.h
@@ -29,10 +29,8 @@
 #ifndef LL_LLINVENTORYMODEL_H
 #define LL_LLINVENTORYMODEL_H
-#include "llassetstorage.h"
+#include "llassettype.h"
 #include "lldarray.h"
-//#include "llskiplist.h"
-//#include "llptrskipmap.h"
 #include "lluuid.h"
 #include "llpermissionsflags.h"
 #include "llstring.h"
@@ -387,7 +385,7 @@ protected:
        static void processMoveInventoryItem(LLMessageSystem* msg, void**);
        static void processFetchInventoryReply(LLMessageSystem* msg, void**);
-        bool messageUpdateCore(LLMessageSystem* msg, bool do_accounting, bool highlight_new);
+        bool messageUpdateCore(LLMessageSystem* msg, bool do_accounting);
 protected:
        // Varaibles used to track what has changed since the last notify.
@@ -751,6 +749,29 @@ protected:
 };
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLInventoryAddedObserver
+//
+// This class is used as a base class for doing something when 
+// a new item arrives in inventory.
+// It does not watch for a certain UUID, rather it acts when anything is added
+// Derive a class from this class and implement the done() method to do
+// something useful.
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+class LLInventoryAddedObserver : public LLInventoryObserver
+{
+public:
+        LLInventoryAddedObserver() : mAdded() {}
+        virtual void changed(U32 mask);
+protected:
+        virtual void done() = 0;
+        typedef std::vector<LLUUID> item_ref_t;
+        item_ref_t mAdded;
+};
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLInventoryTransactionObserver
 //
 // Class which can be used as a base class for doing something when an
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 900b145..bb70ea4 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -451,11 +451,13 @@ void LLInventoryView::init(LLInventoryModel* inventory)
        U32 sort_order = gSavedSettings.getU32("InventorySortOrder");
        BOOL sort_by_name = ! ( sort_order & LLInventoryFilter::SO_DATE );
        BOOL sort_folders_by_name = ( sort_order & LLInventoryFilter::SO_FOLDERS_BY_NAME );
+        BOOL sort_system_folders_to_top = ( sort_order & LLInventoryFilter::SO_SYSTEM_FOLDERS_TO_TOP );
        addBoolControl("Inventory.ShowFilters", FALSE);
        addBoolControl("Inventory.SortByName", sort_by_name );
        addBoolControl("Inventory.SortByDate", ! sort_by_name );
        addBoolControl("Inventory.FoldersAlwaysByName", sort_folders_by_name );
+        addBoolControl("Inventory.SystemFoldersToTop", sort_system_folders_to_top );
        mSavedFolderState = new LLSaveFolderState();
        mSavedFolderState->setApply(FALSE);
@@ -637,20 +639,24 @@ void LLInventoryView::onClose(bool app_quitting)
 BOOL LLInventoryView::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
 {
        LLFolderView* root_folder = mActivePanel ? mActivePanel->getRootFolder() : NULL;
-        // first check for user accepting current search results
+        if (root_folder)
-        if (!called_from_parent && root_folder&&
-                mSearchEditor && mSearchEditor->hasFocus() &&
-                (key == KEY_RETURN || key == KEY_DOWN) && mask == MASK_NONE)
-        {
-                // move focus to inventory proper
-                root_folder->setFocus(TRUE);
-                root_folder->scrollToShowSelection();
-                return TRUE;
-        }
-        if (root_folder->hasFocus() && key == KEY_UP)
        {
-                startSearch();
+                // first check for user accepting current search results
+                if (!called_from_parent
+                    && mSearchEditor && mSearchEditor->hasFocus()
+                    && (key == KEY_RETURN || key == KEY_DOWN)
+                    && mask == MASK_NONE)
+                {
+                        // move focus to inventory proper
+                        root_folder->setFocus(TRUE);
+                        root_folder->scrollToShowSelection();
+                        return TRUE;
+                }
+                if (root_folder->hasFocus() && key == KEY_UP)
+                {
+                        startSearch();
+                }
        }
        return LLFloater::handleKeyHere(key, mask, called_from_parent);
@@ -1364,11 +1370,13 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
        S32 count;
        if (objectp)
-        {
+        {               
-                if (objectp->getType() == LLAssetType::AT_NONE)
+                if (objectp->getType() <= LLAssetType::AT_NONE ||
+                        objectp->getType() >= LLAssetType::AT_COUNT)
                {
-                        llwarns << "LLInventoryPanel::buildNewViews called with objectp->mType == AT_NONE (shouldn't happen)" << llendl;
+                        llwarns << "LLInventoryPanel::buildNewViews called with objectp->mType == " 
-                        itemp = NULL;
+                                << ((S32) objectp->getType())
+                                << " (shouldn't happen)" << llendl;
                }
                else if (objectp->getType() == LLAssetType::AT_CATEGORY) // build new view for category
                {
@@ -1377,19 +1385,16 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
                                                                                                        this,
                                                                                                        objectp->getUUID());
-                        LLFolderViewFolder* folderp = new LLFolderViewFolder(new_listener->getDisplayName(),
+                        if (new_listener)
-                                                                                                new_listener->getIcon(),
-                                                                                                mFolders,
-                                                                                                new_listener);
-                        if (!(mFolders->getSortOrder() & LLInventoryFilter::SO_DATE))
-                        {
-                                folderp->setItemSortFunction(sort_item_name);
-                        }
-                        else
                        {
-                                folderp->setItemSortFunction(sort_item_date);
+                                LLFolderViewFolder* folderp = new LLFolderViewFolder(new_listener->getDisplayName(),
+                                                                                                        new_listener->getIcon(),
+                                                                                                        mFolders,
+                                                                                                        new_listener);
+                                
+                                folderp->setItemSortOrder(mFolders->getSortOrder());
+                                itemp = folderp;
                        }
-                        itemp = folderp;
                }
                else // build new view for item
                {
@@ -1400,11 +1405,14 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
                                this,
                                item->getUUID(),
                                item->getFlags());
-                        itemp = new LLFolderViewItem(new_listener->getDisplayName(),
+                        if (new_listener)
-                                                                                        new_listener->getIcon(),
+                        {
-                                                                                        new_listener->getCreationDate(),
+                                itemp = new LLFolderViewItem(new_listener->getDisplayName(),
-                                                                                        mFolders,
+                                                                                                new_listener->getIcon(),
-                                                                                        new_listener);
+                                                                                                new_listener->getCreationDate(),
+                                                                                                mFolders,
+                                                                                                new_listener);
+                        }
                }
                LLFolderViewFolder* parent_folder = (LLFolderViewFolder*)mFolders->getItemByID(objectp->getParentUUID());
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 35774cb..2105521 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -103,7 +103,7 @@ LLNetMap::LLNetMap(
        LLRect major_dir_rect(  0, DIR_HEIGHT, DIR_WIDTH, 0 );
        mTextBoxNorth = new LLTextBox( "N", major_dir_rect );
-        mTextBoxNorth->setDropshadowVisible( TRUE );
+        mTextBoxNorth->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
        addChild( mTextBoxNorth );
        LLColor4 minor_color( 1.f, 1.f, 1.f, .7f );
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index fd25775..9c73dad 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1522,40 +1522,43 @@ void LLPanelAvatar::resetGroupList()
        {
                return;
        }
-        LLScrollListCtrl*       group_list = LLUICtrlFactory::getScrollListByName(mPanelSecondLife,"groups");
                
-        if (mPanelSecondLife && group_list)
+        if (mPanelSecondLife)
        {
-                group_list->deleteAllItems();
+                LLScrollListCtrl* group_list = LLUICtrlFactory::getScrollListByName(mPanelSecondLife,"groups");
+                if (group_list)
-                S32 count = gAgent.mGroups.count();
-                LLUUID id;
-                for(S32 i = 0; i < count; ++i)
                {
-                        LLGroupData group_data = gAgent.mGroups.get(i);
+                        group_list->deleteAllItems();
-                        id = group_data.mID;
+                        
-                        std::string group_string;
+                        S32 count = gAgent.mGroups.count();
-                        /* Show group title?  DUMMY_POWER for Don Grep
+                        LLUUID id;
-                        if(group_data.mOfficer)
+                        
-                        {
+                        for(S32 i = 0; i < count; ++i)
-                                group_string = "Officer of ";
-                        }
-                        else
                        {
-                                group_string = "Member of ";
+                                LLGroupData group_data = gAgent.mGroups.get(i);
-                        }
+                                id = group_data.mID;
-                        */
+                                std::string group_string;
+                                /* Show group title?  DUMMY_POWER for Don Grep
+                                   if(group_data.mOfficer)
+                                   {
+                                   group_string = "Officer of ";
+                                   }
+                                   else
+                                   {
+                                   group_string = "Member of ";
+                                   }
+                                */
+                                group_string += group_data.mName;
-                        group_string += group_data.mName;
+                                LLSD row;
+                                row["columns"][0]["value"] = group_string;
-                        LLSD row;
+                                row["columns"][0]["font"] = "SANSSERIF_SMALL";
-                        row["columns"][0]["value"] = group_string;
+                                row["columns"][0]["width"] = 0;
-                        row["columns"][0]["font"] = "SANSSERIF_SMALL";
+                                group_list->addElement(row);
-                        row["columns"][0]["width"] = 0;
+                        }
-                        group_list->addElement(row);
+                        group_list->sortByColumn(0, TRUE);
                }
-                group_list->sortByColumn(0, TRUE);
        }
 }
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index 2265ed5..4d138d4 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file llpanelcontents.cpp
 * @brief Object contents panel in the tools floater.
 *
@@ -101,21 +101,25 @@ LLPanelContents::~LLPanelContents()
 void LLPanelContents::getState(LLViewerObject *objectp )
 {
        if( !objectp )
-        {       
+        {
                childSetEnabled("button new script",FALSE);
                //mBtnNewScript->setEnabled( FALSE );
                return;
        }
+        LLUUID group_id;                        // used for SL-23488
+        gSelectMgr->selectGetGroup(group_id);  // sets group_id as a side effect SL-23488
        // BUG? Check for all objects being editable?
-        BOOL editable = gAgent.isGodlike() 
+        BOOL editable = gAgent.isGodlike()
-                                        || (objectp->permModify() && objectp->permYouOwner());
+                                        || (objectp->permModify()
+                                               && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) )));  // solves SL-23488
        BOOL all_volume = gSelectMgr->selectionAllPCode( LL_PCODE_VOLUME );
        // Edit script button - ok if object is editable and there's an
        // unambiguous destination for the object.
-        if(     editable && 
+        if(     editable &&
-                all_volume && 
+                all_volume &&
                ((gSelectMgr->getSelection()->getRootObjectCount() == 1)
                                        || (gSelectMgr->getSelection()->getObjectCount() == 1)))
        {
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index d22d1c2..d79dcb4 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -448,7 +448,6 @@ LLPanelDisplay2::LLPanelDisplay2()
 BOOL LLPanelDisplay2::postBuild()
 {
        requires("ani", WIDGET_TYPE_CHECKBOX);
        requires("gamma", WIDGET_TYPE_SPINNER);
        requires("vbo", WIDGET_TYPE_CHECKBOX);
@@ -466,6 +465,14 @@ BOOL LLPanelDisplay2::postBuild()
        // Graphics Card Memory
        mRadioVideoCardMem = LLUICtrlFactory::getRadioGroupByName(this, "video card memory radio");
+#if !LL_WINDOWS
+        // The probe_hardware_checkbox setting is only used in the Windows build
+        // (It apparently controls a time-consuming DX9 hardware probe.)
+        // Disable the checkbox everywhere else
+        gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE );
+        childSetEnabled("probe_hardware_checkbox", false);
+#endif // !LL_WINDOWS
        refresh();
        return TRUE;
@@ -490,7 +497,8 @@ void LLPanelDisplay2::refresh()
        mParticleCount = gSavedSettings.getS32("RenderMaxPartCount");
        mCompositeLimit = gSavedSettings.getS32("AvatarCompositeLimit");
        mDebugBeaconLineWidth = gSavedSettings.getS32("DebugBeaconLineWidth");
-        
+        mProbeHardwareOnStartup = gSavedSettings.getBOOL("ProbeHardwareOnStartup");
        refreshEnabledState();
 }
@@ -521,7 +529,6 @@ void LLPanelDisplay2::apply()
                gViewerWindow->restartDisplay(logged_in);
        }
-        
        refresh();
 }
@@ -537,6 +544,7 @@ void LLPanelDisplay2::cancel()
        gSavedSettings.setS32("RenderMaxPartCount", mParticleCount);
        gSavedSettings.setS32("AvatarCompositeLimit", mCompositeLimit);
        gSavedSettings.setS32("DebugBeaconLineWidth", mDebugBeaconLineWidth);
+        gSavedSettings.setBOOL("ProbeHardwareOnStartup", mProbeHardwareOnStartup );
 }
 //============================================================================
diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h
index b4db723..80aae66 100644
--- a/linden/indra/newview/llpaneldisplay.h
+++ b/linden/indra/newview/llpaneldisplay.h
@@ -102,7 +102,7 @@ protected:
        S32 mParticleCount;
        S32 mCompositeLimit;
        S32 mDebugBeaconLineWidth;
+        BOOL mProbeHardwareOnStartup;
 };
 class LLPanelDisplay3 : public LLPanel
@@ -147,7 +147,6 @@ protected:
        F32 mFlexLOD;
        F32 mTreeLOD;
        F32 mAvatarLOD;
 };
 const S32 LL_MAX_VRAM_INDEX = 6;
diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index 8f24c55..9cbfdc2 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -505,7 +505,16 @@ void LLPanelFace::getState()
                {
                        F32 shinyf = 0.f;
                        identical = allFacesSameValue( &LLPanelFace::valueShiny, &shinyf );
-                        childGetSelectionInterface("combobox shininess")->selectNthItem((S32)shinyf);
+                        LLCtrlSelectionInterface* combobox_shininess =
+                              childGetSelectionInterface("combobox shininess");
+                        if (combobox_shininess)
+                        {
+                                combobox_shininess->selectNthItem((S32)shinyf);
+                        }
+                        else
+                        {
+                                llwarns << "failed childGetSelectionInterface for 'combobox shininess'" << llendl;
+                        }
                        childSetEnabled("combobox shininess",editable);
                        childSetTentative("combobox shininess",!identical);
                        childSetEnabled("label shininess",editable);
@@ -514,7 +523,16 @@ void LLPanelFace::getState()
                {
                        F32 bumpf = 0.f;
                        identical = allFacesSameValue( &LLPanelFace::valueBump, &bumpf );
-                        childGetSelectionInterface("combobox bumpiness")->selectNthItem((S32)bumpf);
+                        LLCtrlSelectionInterface* combobox_bumpiness =
+                              childGetSelectionInterface("combobox bumpiness");
+                        if (combobox_bumpiness)
+                        {
+                                combobox_bumpiness->selectNthItem((S32)bumpf);
+                        }
+                        else
+                        {
+                                llwarns << "failed childGetSelectionInterface for 'combobox bumpiness'" << llendl;
+                        }
                        childSetEnabled("combobox bumpiness",editable);
                        childSetTentative("combobox bumpiness",!identical);
                        childSetEnabled("label bumpiness",editable);
@@ -523,8 +541,17 @@ void LLPanelFace::getState()
                {
                        F32 genf = 0.f;
                        identical = allFacesSameValue( &LLPanelFace::valueTexGen, &genf);
-                        S32     selected_texgen = ((S32) genf) >> TEM_TEX_GEN_SHIFT;
+                        S32 selected_texgen = ((S32) genf) >> TEM_TEX_GEN_SHIFT;
-                        childGetSelectionInterface("combobox texgen")->selectNthItem(selected_texgen);
+                        LLCtrlSelectionInterface* combobox_texgen =
+                              childGetSelectionInterface("combobox texgen");
+                        if (combobox_texgen)
+                        {
+                                combobox_texgen->selectNthItem(selected_texgen);
+                        }
+                        else
+                        {
+                                llwarns << "failed childGetSelectionInterface for 'combobox texgen'" << llendl;
+                        }
                        childSetEnabled("combobox texgen",editable);
                        childSetTentative("combobox texgen",!identical);
                        childSetEnabled("tex gen",editable);
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 900598a..d60471d 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -105,7 +105,6 @@ BOOL LLPanelGeneral::postBuild()
        requires("rotate_mini_map_checkbox", WIDGET_TYPE_CHECKBOX);
        requires("friends_online_notify_checkbox", WIDGET_TYPE_CHECKBOX);
        requires("notify_money_change_checkbox", WIDGET_TYPE_CHECKBOX);
-        requires("probe_hardware_checkbox", WIDGET_TYPE_CHECKBOX);
        requires("use_system_color_picker_checkbox", WIDGET_TYPE_CHECKBOX);
        requires("crash_behavior_combobox", WIDGET_TYPE_COMBO_BOX);
@@ -152,14 +151,6 @@ BOOL LLPanelGeneral::postBuild()
        
        childSetCommitCallback("language_combobox", set_language );
        childSetValue("language_combobox",      gSavedSettings.getString("Language"));
-                
-#if !LL_WINDOWS
-        // The probe_hardware_checkbox setting is only used in the Windows build
-        // (It apparently controls a time-consuming DX9 hardware probe.)
-        // Disable the checkbox everywhere else
-        gSavedSettings.setBOOL("ProbeHardwareOnStartup", FALSE );
-        childSetEnabled("probe_hardware_checkbox", false);
-#endif // !LL_WINDOWS
        refresh();
@@ -205,7 +196,7 @@ void LLPanelGeneral::refresh()
        mAFKTimeout = gSavedSettings.getF32("AFKTimeout");
        mMiniMapRotate = gSavedSettings.getBOOL("MiniMapRotate");
        mNotifyMoney = gSavedSettings.getBOOL("NotifyMoneyChange");
-        mProbeHardwareOnStartup = gSavedSettings.getBOOL("ProbeHardwareOnStartup");
+        mShowNewInventory = gSavedSettings.getBOOL("ShowNewInventory");
        mUseDefaultColor = gSavedSettings.getBOOL("UseDefaultColorPicker");
        mEffectColor = gSavedSettings.getColor4("EffectColor");
@@ -226,7 +217,7 @@ void LLPanelGeneral::cancel()
        gSavedSettings.setF32("AFKTimeout", mAFKTimeout );
        gSavedSettings.setBOOL("MiniMapRotate", mMiniMapRotate );
        gSavedSettings.setBOOL("NotifyMoneyChange", mNotifyMoney );
-        gSavedSettings.setBOOL("ProbeHardwareOnStartup", mProbeHardwareOnStartup );
+        gSavedSettings.setBOOL("ShowNewInventory", mShowNewInventory);
        gSavedSettings.setBOOL("UseDefaultColorPicker", mUseDefaultColor );
        gSavedSettings.setColor4("EffectColor", mEffectColor );
        gSavedSettings.setString("Language", mLanguage);
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h
index 9f70560..fe4ff4e 100644
--- a/linden/indra/newview/llpanelgeneral.h
+++ b/linden/indra/newview/llpanelgeneral.h
@@ -61,7 +61,7 @@ protected:
        BOOL mChatOnlineNotification;
        F32 mAFKTimeout;
        BOOL mNotifyMoney;
-        BOOL mProbeHardwareOnStartup;
+        BOOL mShowNewInventory;
        BOOL mUseDefaultColor;
        LLColor4 mEffectColor;
        BOOL mMiniMapRotate;
diff --git a/linden/indra/newview/llpanelgroup.cpp b/linden/indra/newview/llpanelgroup.cpp
index 6710c43..47dacf3 100644
--- a/linden/indra/newview/llpanelgroup.cpp
+++ b/linden/indra/newview/llpanelgroup.cpp
@@ -660,7 +660,7 @@ void LLPanelGroup::showNotice(const char* subject,
                // We need to clean up that inventory offer.
                if (inventory_offer)
                {
-                        inventory_offer_callback( 1 , inventory_offer); 
+                        inventory_offer_callback( IOR_DECLINE , inventory_offer); 
                }
                return;
        }
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 67a0c31..5ec9651 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -45,10 +45,10 @@
 #include "llnamebox.h"
 #include "llnamelistctrl.h"
 #include "llspinctrl.h"
+#include "llstatusbar.h"        // can_afford_transaction()
 #include "lltextbox.h"
 #include "lltexteditor.h"
 #include "lltexturectrl.h"
-#include "llviewermessage.h"
 #include "llviewerwindow.h"
 // static
@@ -322,19 +322,27 @@ void LLPanelGroupGeneral::onClickJoin(void *userdata)
        LLGroupMgrGroupData* gdatap = gGroupMgr->getGroupData(self->mGroupID);
-        S32 cost = gdatap->mMembershipFee;
+        if (gdatap)
-        LLString::format_map_t args;
-        args["[COST]"] = llformat("%d", cost);
-        if (can_afford_transaction(cost))
        {
-                gViewerWindow->alertXml("JoinGroupCanAfford", args,
+                S32 cost = gdatap->mMembershipFee;
-                                                                LLPanelGroupGeneral::joinDlgCB,
+                LLString::format_map_t args;
-                                                                self);
+                args["[COST]"] = llformat("%d", cost);
+                
+                if (can_afford_transaction(cost))
+                {
+                        gViewerWindow->alertXml("JoinGroupCanAfford", args,
+                                                LLPanelGroupGeneral::joinDlgCB,
+                                                self);
+                }
+                else
+                {
+                        gViewerWindow->alertXml("JoinGroupCannotAfford", args);
+                }
        }
        else
        {
-                gViewerWindow->alertXml("JoinGroupCannotAfford", args);
+                llwarns << "gGroupMgr->getGroupData(" << self->mGroupID
+                        << ") was NULL" << llendl;
        }
 }
diff --git a/linden/indra/newview/llpanelgroupnotices.cpp b/linden/indra/newview/llpanelgroupnotices.cpp
index 373f3f2..a001455 100644
--- a/linden/indra/newview/llpanelgroupnotices.cpp
+++ b/linden/indra/newview/llpanelgroupnotices.cpp
@@ -204,7 +204,7 @@ LLPanelGroupNotices::~LLPanelGroupNotices()
        if (mInventoryOffer)
        {
                // Cancel the inventory offer.
-                inventory_offer_callback( 1 , mInventoryOffer); 
+                inventory_offer_callback( IOR_DECLINE , mInventoryOffer); 
                mInventoryOffer = NULL;
        }
 }
@@ -359,7 +359,7 @@ void LLPanelGroupNotices::onClickOpenAttachment(void* data)
 {
        LLPanelGroupNotices* self = (LLPanelGroupNotices*)data;
-        inventory_offer_callback( 0 , self->mInventoryOffer);
+        inventory_offer_callback( IOR_ACCEPT , self->mInventoryOffer);
        self->mInventoryOffer = NULL;
        self->mBtnOpenAttachment->setEnabled(FALSE);
 }
@@ -398,7 +398,7 @@ void LLPanelGroupNotices::onClickNewMessage(void* data)
        if (self->mInventoryOffer)
        {
-                inventory_offer_callback( 1 , self->mInventoryOffer);
+                inventory_offer_callback( IOR_DECLINE , self->mInventoryOffer);
                self->mInventoryOffer = NULL;
        }
@@ -548,7 +548,7 @@ void LLPanelGroupNotices::showNotice(const char* subject,
        if (mInventoryOffer)
        {
                // Cancel the inventory offer for the previously viewed notice
-                inventory_offer_callback( 1 , mInventoryOffer); 
+                inventory_offer_callback( IOR_DECLINE , mInventoryOffer); 
                mInventoryOffer = NULL;
        }
diff --git a/linden/indra/newview/llpanelgrouproles.cpp b/linden/indra/newview/llpanelgrouproles.cpp
index 266ff12..5765a12 100644
--- a/linden/indra/newview/llpanelgrouproles.cpp
+++ b/linden/indra/newview/llpanelgrouproles.cpp
@@ -1323,13 +1323,17 @@ void LLPanelGroupMembersSubTab::onRoleCheck(LLUICtrl* ctrl, void* user_data)
        LLCheckBoxCtrl* check_box = static_cast<LLCheckBoxCtrl*>(ctrl);
        if (!check_box || !self) return;
+        LLScrollListItem* first_selected =
-        LLUUID role_id = self->mAssignedRolesList->getFirstSelected()->getUUID();
+                self->mAssignedRolesList->getFirstSelected();
-        LLRoleMemberChangeType change_type = (check_box->get() ? 
+        if (first_selected)
-                                                                                  RMC_ADD : 
+        {
-                                                                                  RMC_REMOVE);
+                LLUUID role_id = first_selected->getUUID();
+                LLRoleMemberChangeType change_type = (check_box->get() ? 
-        self->handleRoleCheck(role_id, change_type);
+                                                      RMC_ADD : 
+                                                      RMC_REMOVE);
+                
+                self->handleRoleCheck(role_id, change_type);
+        }
 }
 void LLPanelGroupMembersSubTab::handleMemberDoubleClick()
@@ -2056,8 +2060,9 @@ void LLPanelGroupRolesSubTab::update(LLGroupChange gc)
        }
        if ((GC_ROLE_MEMBER_DATA == gc || GC_MEMBER_DATA == gc)
-                && gdatap->isMemberDataComplete()
+            && gdatap
-                && gdatap->isRoleMemberDataComplete())
+            && gdatap->isMemberDataComplete()
+            && gdatap->isRoleMemberDataComplete())
        {
                buildMembersList();
        }
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 2089a6c..13cee05 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file llpanelinventory.cpp
 * @brief LLPanelInventory class implementation
 *
@@ -72,7 +72,7 @@
 #include "llviewerregion.h"
 #include "llviewerimagelist.h"
 #include "llviewerinventory.h"
-#include "llviewermessage.h" 
+#include "llviewermessage.h"
 #include "llviewerobject.h"
 #include "llviewerobjectlist.h"
 #include "llviewerwindow.h"
@@ -197,7 +197,7 @@ struct LLBuyInvItemData
        LLUUID mTaskID;
        LLUUID mItemID;
        LLAssetType::EType mType;
-        
        LLBuyInvItemData(const LLUUID& task,
                                         const LLUUID& item,
                                         LLAssetType::EType type) :
@@ -217,34 +217,45 @@ void LLTaskInvFVBridge::buyItem()
        const LLSaleInfo& sale_info = item->getSaleInfo();
        const LLPermissions& perm = item->getPermissions();
        const LLString owner_name; // no owner name currently... FIXME?
-        
-        LLString::format_map_t args;
-        args["[PRICE]"] = llformat("%d",sale_info.getSalePrice());
-        args["[OWNER]"] = owner_name;
-        if (sale_info.getSaleType() != LLSaleInfo::FS_CONTENTS)
-        {
-                U32 next_owner_mask = perm.getMaskNextOwner();
-                args["[MODIFYPERM]"] = LLAlertDialog::getTemplateMessage((next_owner_mask & PERM_MODIFY) ? "PermYes" : "PermNo");
-                args["[COPYPERM]"] = LLAlertDialog::getTemplateMessage((next_owner_mask & PERM_COPY) ? "PermYes" : "PermNo");
-                args["[RESELLPERM]"] = LLAlertDialog::getTemplateMessage((next_owner_mask & PERM_TRANSFER) ? "PermYes" : "PermNo");
-        }
-        LLString alertdesc;
+        LLViewerObject* obj;
-        switch(sale_info.getSaleType())
+        if( ( obj = gObjectList.findObject( mPanel->getTaskUUID() ) ) && obj->isAttachment() )
        {
-          case LLSaleInfo::FS_ORIGINAL:
+                gViewerWindow->alertXml("Cannot_Purchase_an_Attachment");
-                alertdesc = owner_name.empty() ? "BuyOriginalNoOwner" : "BuyOriginal";
+                llinfos << "Attempt to purchase an attachment" << llendl;
-                break;
-          case LLSaleInfo::FS_COPY:
-          default:
-                alertdesc = owner_name.empty() ? "BuyCopyNoOwner" : "BuyCopy";
-                break;
-          case LLSaleInfo::FS_CONTENTS:
-                alertdesc = owner_name.empty() ? "BuyContentsNoOwner" : "BuyContents";
-                break;
        }
-        
+        else
-        gViewerWindow->alertXml(alertdesc, args, LLTaskInvFVBridge::commitBuyItem, (void*)inv);
+        {
+                LLString::format_map_t args;
+                args["[PRICE]"] = llformat("%d",sale_info.getSalePrice());
+                args["[OWNER]"] = owner_name;
+                if (sale_info.getSaleType() != LLSaleInfo::FS_CONTENTS)
+                {
+                        U32 next_owner_mask = perm.getMaskNextOwner();
+                        args["[MODIFYPERM]"] = LLAlertDialog::getTemplateMessage((next_owner_mask & PERM_MODIFY) ? "PermYes" : "PermNo");
+                        args["[COPYPERM]"] = LLAlertDialog::getTemplateMessage((next_owner_mask & PERM_COPY) ? "PermYes" : "PermNo");
+                        args["[RESELLPERM]"] = LLAlertDialog::getTemplateMessage((next_owner_mask & PERM_TRANSFER) ? "PermYes" : "PermNo");
+                }
+                LLString alertdesc;
+                switch(sale_info.getSaleType())
+                {
+                  case LLSaleInfo::FS_ORIGINAL:
+                        alertdesc = owner_name.empty() ? "BuyOriginalNoOwner" : "BuyOriginal";
+                        break;
+                  case LLSaleInfo::FS_COPY:
+                  default:
+                        alertdesc = owner_name.empty() ? "BuyCopyNoOwner" : "BuyCopy";
+                        break;
+                  case LLSaleInfo::FS_CONTENTS:
+                        alertdesc = owner_name.empty() ? "BuyContentsNoOwner" : "BuyContents";
+                        break;
+                }
+                gViewerWindow->alertXml(alertdesc, args, LLTaskInvFVBridge::commitBuyItem, (void*)inv);
+        }
 }
 S32 LLTaskInvFVBridge::getPrice()
@@ -269,7 +280,7 @@ void LLTaskInvFVBridge::commitBuyItem(S32 option, void* data)
        {
                LLViewerObject* object = gObjectList.findObject(inv->mTaskID);
                if(!object || !object->getRegion()) return;
-                
                LLMessageSystem* msg = gMessageSystem;
                msg->newMessageFast(_PREHASH_BuyObjectInventory);
@@ -289,12 +300,12 @@ void LLTaskInvFVBridge::commitBuyItem(S32 option, void* data)
 const LLString& LLTaskInvFVBridge::getName() const
 {
        return mName;
-} 
+}
 const LLString& LLTaskInvFVBridge::getDisplayName() const
 {
        LLInventoryItem* item = findItem();
-        if(item) 
+        if(item)
        {
                mDisplayName.assign(item->getName());
@@ -316,9 +327,9 @@ const LLString& LLTaskInvFVBridge::getDisplayName() const
                        mDisplayName.append(" (no transfer)");
                }
        }
-        
        return mDisplayName;
-} 
+}
 // BUG: No creation dates for task inventory
 U32 LLTaskInvFVBridge::getCreationDate() const
@@ -444,7 +455,7 @@ BOOL LLTaskInvFVBridge::removeItem()
                        {
                                // just do it.
                                object->removeInventory(mUUID);
-                                return TRUE;                                                    
+                                return TRUE;
                        }
                        else
                        {
@@ -542,20 +553,20 @@ BOOL LLTaskInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id)
                        if((inv = (LLInventoryItem*)object->getInventoryObject(mUUID)))
                        {
                                const LLPermissions& perm = inv->getPermissions();
-                                bool can_copy = gAgent.allowOperation(PERM_COPY, perm, 
+                                bool can_copy = gAgent.allowOperation(PERM_COPY, perm,
                                                                                                                GP_OBJECT_MANIPULATE);
                                if (object->isAttachment() && !can_copy)
-                                {                                               
+                                {
                    //RN: no copy contents of attachments cannot be dragged out
                    // due to a race condition and possible exploit where
                    // attached objects do not update their inventory items
-                    // when their contents are manipulated  
+                    // when their contents are manipulated
-                    return FALSE;                           
+                    return FALSE;
-                                }              
+                                }
                                if((can_copy && perm.allowTransferTo(gAgent.getID()))
                                   || object->permYouOwner())
 //                                 || gAgent.isGodlike())
-                                        
                                {
                                        *type = LLAssetType::lookupDragAndDropType(inv->getType());
@@ -621,7 +632,7 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
        std::vector<LLString> items;
        std::vector<LLString> disabled_items;
-        if(gAgent.allowOperation(PERM_OWNER, item->getPermissions(), 
+        if(gAgent.allowOperation(PERM_OWNER, item->getPermissions(),
                                                         GP_OBJECT_MANIPULATE)
           && item->getSaleInfo().isForSale())
        {
@@ -755,12 +766,12 @@ BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id)
                        if((inv = (LLInventoryItem*)object->getInventoryObject(mUUID)))
                        {
                                const LLPermissions& perm = inv->getPermissions();
-                                bool can_copy = gAgent.allowOperation(PERM_COPY, perm, 
+                                bool can_copy = gAgent.allowOperation(PERM_COPY, perm,
                                                                                                                GP_OBJECT_MANIPULATE);
                                if((can_copy && perm.allowTransferTo(gAgent.getID()))
                                   || object->permYouOwner())
 //                                 || gAgent.isGodlike())
-                                        
                                {
                                        *type = LLAssetType::lookupDragAndDropType(inv->getType());
@@ -776,7 +787,7 @@ BOOL LLTaskCategoryBridge::startDrag(EDragAndDropType* type, LLUUID* id)
 BOOL LLTaskCategoryBridge::dragOrDrop(MASK mask, BOOL drop,
                                                                          EDragAndDropType cargo_type,
                                                                          void* cargo_data)
-{       
+{
        //llinfos << "LLTaskCategoryBridge::dragOrDrop()" << llendl;
        BOOL accept = FALSE;
        LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
@@ -1060,7 +1071,7 @@ LLTaskLandmarkBridge::LLTaskLandmarkBridge(
        LLTaskInvFVBridge(panel, uuid, name)
 {
 }
-        
 LLViewerImage* LLTaskLandmarkBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_LANDMARK, LLInventoryType::IT_LANDMARK, 0, FALSE);
@@ -1091,7 +1102,7 @@ LLTaskCallingCardBridge::LLTaskCallingCardBridge(
        LLTaskInvFVBridge(panel, uuid, name)
 {
 }
-        
 LLViewerImage* LLTaskCallingCardBridge::getIcon() const
 {
        return get_item_icon(LLAssetType::AT_CALLINGCARD, LLInventoryType::IT_CALLINGCARD, 0, FALSE);
@@ -1476,7 +1487,7 @@ LLTaskWearableBridge::LLTaskWearableBridge(
        mAssetType( asset_type )
 {
 }
-        
 LLViewerImage* LLTaskWearableBridge::getIcon() const
 {
        return get_item_icon(mAssetType, LLInventoryType::IT_WEARABLE, mFlags, FALSE );
@@ -1648,7 +1659,7 @@ void LLPanelInventory::inventoryChanged(LLViewerObject* object,
 {
        if(!object) return;
-        //llinfos << "invetnory arrived: \n" 
+        //llinfos << "invetnory arrived: \n"
        //              << " panel UUID: " << panel->mTaskUUID << "\n"
        //              << " task  UUID: " << object->mID << llendl;
        if(mTaskUUID == object->mID)
@@ -1686,7 +1697,7 @@ void LLPanelInventory::inventoryChanged(LLViewerObject* object,
 void LLPanelInventory::updateInventory()
 {
-        //llinfos << "inventory arrived: \n" 
+        //llinfos << "inventory arrived: \n"
        //              << " panel UUID: " << panel->mTaskUUID << "\n"
        //              << " task  UUID: " << object->mID << llendl;
        // We're still interested in this task's inventory.
@@ -1865,7 +1876,7 @@ void LLPanelInventory::refresh()
                                // Otherwise we show the old stuff until the update comes in
                                clearContents();
-                                // Register for updates from this object, 
+                                // Register for updates from this object,
                                registerVOInventoryListener(object,NULL);
                        }
@@ -1978,7 +1989,7 @@ BOOL LLPanelInventory::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDr
        }
 }
-//static 
+//static
 void LLPanelInventory::idle(void* user_data)
 {
        LLPanelInventory* self = (LLPanelInventory*)user_data;
diff --git a/linden/indra/newview/llpanelmsgs.cpp b/linden/indra/newview/llpanelmsgs.cpp
index f25d477..3f5314c 100644
--- a/linden/indra/newview/llpanelmsgs.cpp
+++ b/linden/indra/newview/llpanelmsgs.cpp
@@ -88,14 +88,33 @@ void LLPanelMsgs::buildLists()
                                row["columns"][1]["font"] = "SANSSERIF_SMALL";
                                row["columns"][1]["width"] = 160;
                        }
-                        item = mDisabledPopups->addElement(row, ADD_SORTED);
+                        if (mDisabledPopups)
+                        {
+                                item = mDisabledPopups->addElement(row,
+                                                                   ADD_SORTED);
+                        }
+                        else
+                        {
+                                llwarns << "(ignore) but also (!mDisabledPopups)" << llendl;
+                        }
                }
                else
                {
-                        item = mEnabledPopups->addElement(row, ADD_SORTED);
+                        if (mEnabledPopups)
+                        {
+                                item = mEnabledPopups->addElement(row,
+                                                                  ADD_SORTED);
+                        }
+                        else
+                        {
+                                llwarns << "(!ignore) but also (!mEnabledPopups)" << llendl;
+                        }
                }
-                item->setUserdata((void*)&iter->first);
+                if (item)
+                {
+                        item->setUserdata((void*)&iter->first);
+                }
        }       
 }
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index 18ec28e..6e8a4ff 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -726,14 +726,17 @@ void LLPanelPermissions::refresh()
        LLSaleInfo::EForSale sale_type = sale_info.getSaleType();
        LLRadioGroup* RadioSaleType = gUICtrlFactory->getRadioGroupByName(this,"sale type");
-        if(RadioSaleType && valid_sale_info)
+        if(RadioSaleType)
        {
-                RadioSaleType->setSelectedIndex((S32)sale_type - 1);
+                if (valid_sale_info)
-        }
+                {
-        else
+                        RadioSaleType->setSelectedIndex((S32)sale_type - 1);
-        {
+                }
-                // default option is sell copy, determined to be safest
+                else
-                RadioSaleType->setSelectedIndex((S32)LLSaleInfo::FS_COPY - 1);
+                {
+                        // default option is sell copy, determined to be safest
+                        RadioSaleType->setSelectedIndex((S32)LLSaleInfo::FS_COPY - 1);
+                }
        }
        if (is_for_sale)
diff --git a/linden/indra/newview/llpatchvertexarray.cpp b/linden/indra/newview/llpatchvertexarray.cpp
index bfd4ff4..611ff97 100644
--- a/linden/indra/newview/llpatchvertexarray.cpp
+++ b/linden/indra/newview/llpatchvertexarray.cpp
@@ -126,8 +126,16 @@ void LLPatchVertexArray::create(U32 surface_width, U32 patch_width, F32 meters_p
                mRenderStridep = new U32 [mPatchOrder + 1];
        }
+        if (NULL == mRenderLevelp || NULL == mRenderStridep)
+        {
+                // init() and some other things all want to deref these
+                // pointers, so this is serious.
+                llerrs << "mRenderLevelp or mRenderStridep was NULL; we'd crash soon." << llendl;
+                return;
+        }
-        // Now that we've allocated memory, we can initialize the arrays...
+        // Now that we've allocated memory, we can initialize
+        // the arrays...
        init();
 }
diff --git a/linden/indra/newview/llpolymesh.cpp b/linden/indra/newview/llpolymesh.cpp
index cf94142..1edb8f5 100644
--- a/linden/indra/newview/llpolymesh.cpp
+++ b/linden/indra/newview/llpolymesh.cpp
@@ -301,6 +301,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                if (numRead != 1)
                {
                        llerrs << "can't read HasWeights flag from " << fileName << llendl;
+                        return FALSE;
                }
                if (!isLOD())
                {
@@ -315,6 +316,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                if (numRead != 1)
                {
                        llerrs << "can't read HasDetailTexCoords flag from " << fileName << llendl;
+                        return FALSE;
                }
                //----------------------------------------------------------------
@@ -326,6 +328,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                if (numRead != 3)
                {
                        llerrs << "can't read Position from " << fileName << llendl;
+                        return FALSE;
                }
                setPosition( position );
@@ -338,6 +341,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                if (numRead != 3)
                {
                        llerrs << "can't read RotationAngles from " << fileName << llendl;
+                        return FALSE;
                }
                U8 rotationOrder;
@@ -346,6 +350,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                if (numRead != 1)
                {
                        llerrs << "can't read RotationOrder from " << fileName << llendl;
+                        return FALSE;
                }
                rotationOrder = 0;
@@ -364,6 +369,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                if (numRead != 3)
                {
                        llerrs << "can't read Scale from " << fileName << llendl;
+                        return FALSE;
                }
                setScale( scale );
@@ -384,6 +390,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                        if (numRead != 1)
                        {
                                llerrs << "can't read NumVertices from " << fileName << llendl;
+                                return FALSE;
                        }
                        allocateVertexData( numVertices );      
@@ -396,6 +403,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                        if (numRead != numVertices)
                        {
                                llerrs << "can't read Coordinates from " << fileName << llendl;
+                                return FALSE;
                        }
                        //----------------------------------------------------------------
@@ -406,6 +414,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                        if (numRead != numVertices)
                        {
                                llerrs << " can't read Normals from " << fileName << llendl;
+                                return FALSE;
                        }
                        //----------------------------------------------------------------
@@ -416,6 +425,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                        if (numRead != numVertices)
                        {
                                llerrs << " can't read Binormals from " << fileName << llendl;
+                                return FALSE;
                        }
@@ -427,6 +437,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                        if (numRead != numVertices)
                        {
                                llerrs << "can't read TexCoords from " << fileName << llendl;
+                                return FALSE;
                        }
                        //----------------------------------------------------------------
@@ -439,6 +450,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                                if (numRead != numVertices)
                                {
                                        llerrs << "can't read DetailTexCoords from " << fileName << llendl;
+                                        return FALSE;
                                }
                        }
@@ -452,6 +464,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                                if (numRead != numVertices)
                                {
                                        llerrs << "can't read Weights from " << fileName << llendl;
+                                        return FALSE;
                                }
                        }
                }
@@ -465,6 +478,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                if (numRead != 1)
                {
                        llerrs << "can't read NumFaces from " << fileName << llendl;
+                        return FALSE;
                }
                allocateFaceData( numFaces );
@@ -482,6 +496,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                        if (numRead != 3)
                        {
                                llerrs << "can't read Face[" << i << "] from " << fileName << llendl;
+                                return FALSE;
                        }
                        if (mReferenceData)
                        {
@@ -538,6 +553,7 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                                if (numRead != 1)
                                {
                                        llerrs << "can't read NumSkinJoints from " << fileName << llendl;
+                                        return FALSE;
                                }
                                allocateJointNames( numSkinJoints );
                        }
@@ -547,11 +563,13 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                        //----------------------------------------------------------------
                        for (i=0; i < numSkinJoints; i++)
                        {
-                                char jointName[64];             /*Flawfinder: ignore*/
+                                char jointName[64+1];
-                                numRead = fread(jointName, sizeof(jointName), 1, fp);
+                                numRead = fread(jointName, sizeof(jointName)-1, 1, fp);
+                                jointName[sizeof(jointName)-1] = '\0'; // ensure nul-termination
                                if (numRead != 1)
                                {
                                        llerrs << "can't read Skin[" << i << "].Name from " << fileName << llendl;
+                                        return FALSE;
                                }
                                std::string *jn = &mJointNames[i];
@@ -561,7 +579,8 @@ BOOL LLPolyMeshSharedData::loadMesh( const char *fileName )
                        //-------------------------------------------------------------------------
                        // look for morph section
                        //-------------------------------------------------------------------------
-                        char morphName[64];             /*Flawfinder: ignore*/
+                        char morphName[64+1];
+                        morphName[sizeof(morphName)-1] = '\0'; // ensure nul-termination
                        while(fread(&morphName, sizeof(char), 64, fp) == 64)
                        {
                                if (!strcmp(morphName, "End Morphs"))
@@ -991,6 +1010,13 @@ BOOL LLPolySkeletalDistortionInfo::parseXml(LLXmlTreeNode* node)
        LLXmlTreeNode* skeletalParam = node->getChildByName("param_skeleton");
+        if (NULL == skeletalParam)
+        {
+                llwarns << "Failed to getChildByName(\"param_skeleton\")"
+                        << llendl;
+                return FALSE;
+        }
        for( LLXmlTreeNode* bone = skeletalParam->getFirstChild(); bone; bone = skeletalParam->getNextChild() )
        {
                if (bone->hasName("bone"))
diff --git a/linden/indra/newview/llpolymorph.cpp b/linden/indra/newview/llpolymorph.cpp
index 2d1375d..b36f0e2 100644
--- a/linden/indra/newview/llpolymorph.cpp
+++ b/linden/indra/newview/llpolymorph.cpp
@@ -214,6 +214,13 @@ BOOL LLPolyMorphTargetInfo::parseXml(LLXmlTreeNode* node)
        LLXmlTreeNode *paramNode = node->getChildByName("param_morph");
+        if (NULL == paramNode)
+        {
+                llwarns << "Failed to getChildByName(\"param_morph\")"
+                        << llendl;
+                return FALSE;
+        }
        for (LLXmlTreeNode* child_node = paramNode->getFirstChild();
                 child_node;
                 child_node = paramNode->getNextChild())
@@ -256,7 +263,10 @@ LLPolyMorphTarget::LLPolyMorphTarget(LLPolyMesh *poly_mesh)
 //-----------------------------------------------------------------------------
 LLPolyMorphTarget::~LLPolyMorphTarget()
 {
-        delete mVertMask;
+        if (mVertMask)
+        {
+                delete mVertMask;
+        }
 }
 //-----------------------------------------------------------------------------
diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index 347c6d5..23f31aa 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -60,6 +60,7 @@ LLPreview::LLPreview(const std::string& name) :
        LLFloater(name),
        mCopyToInvBtn(NULL),
        mForceClose(FALSE),
+        mUserResized(FALSE),
        mCloseAfterSave(FALSE),
        mAssetStatus(PREVIEW_ASSET_UNLOADED)
 {
@@ -76,6 +77,7 @@ LLPreview::LLPreview(const std::string& name, const LLRect& rect, const std::str
        mObjectUUID(object_uuid),
        mCopyToInvBtn( NULL ),
        mForceClose( FALSE ),
+        mUserResized(FALSE),
        mCloseAfterSave(FALSE),
        mAssetStatus(PREVIEW_ASSET_UNLOADED)
 {
@@ -189,8 +191,6 @@ void LLPreview::onCommit()
                }
                
                LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
-                BOOL has_sale_info = FALSE;
-                LLSaleInfo sale_info;
                new_item->setDescription(childGetText("desc"));
                if(mObjectUUID.notNull())
                {
@@ -222,11 +222,6 @@ void LLPreview::onCommit()
                                                gSelectMgr->deselectAll();
                                                gSelectMgr->addAsIndividual( obj, SELECT_ALL_TES, FALSE );
                                                gSelectMgr->selectionSetObjectDescription( childGetText("desc") );
-                                        
-                                                if( has_sale_info )
-                                                {
-                                                        gSelectMgr->selectionSetObjectSaleInfo( sale_info );
-                                                }
                                                gSelectMgr->deselectAll();
                                        }
@@ -487,6 +482,12 @@ LLPreview* LLPreview::getFirstPreviewForSource(const LLUUID& source_id)
        return NULL;
 }
+void LLPreview::userSetShape(const LLRect& new_rect)
+{
+        userResized();
+        LLView::userSetShape(new_rect);
+}
 //
 // LLMultiPreview
 //
@@ -506,6 +507,15 @@ void LLMultiPreview::open()		/*Flawfinder: ignore*/
        }
 }
+void LLMultiPreview::userSetShape(const LLRect& new_rect)
+{
+        LLPreview* frontmost_preview = (LLPreview*)mTabContainer->getCurrentPanel();
+        if (frontmost_preview) frontmost_preview->userResized();
+        LLView::userSetShape(new_rect);
+}
 void LLMultiPreview::tabOpen(LLFloater* opened_floater, bool from_click)
 {
        LLPreview* opened_preview = (LLPreview*)opened_floater;
diff --git a/linden/indra/newview/llpreview.h b/linden/indra/newview/llpreview.h
index 266bdd1..c8c0355 100644
--- a/linden/indra/newview/llpreview.h
+++ b/linden/indra/newview/llpreview.h
@@ -48,6 +48,7 @@ public:
        /*virtual*/void open();         /*Flawfinder: ignore*/
        /*virtual*/void tabOpen(LLFloater* opened_floater, bool from_click);
+        /*virtual*/ void userSetShape(const LLRect& new_rect);
        static LLMultiPreview* getAutoOpenInstance(const LLUUID& id);
        static void setAutoOpenInstance(LLMultiPreview* previewp, const LLUUID& id);
@@ -101,6 +102,9 @@ public:
        void                            addKeepDiscardButtons();
        static void                     onKeepBtn(void* data);
        static void                     onDiscardBtn(void* data);
+        /*virtual*/ void        userSetShape(const LLRect& new_rect);
+        void userResized() { mUserResized = TRUE; };
        virtual void loadAsset() { mAssetStatus = PREVIEW_ASSET_LOADED; }
        virtual EAssetStatus getAssetStatus() { return mAssetStatus;}
@@ -135,6 +139,8 @@ protected:
        // Close without saving changes
        BOOL mForceClose;
+        BOOL mUserResized;
        // When closing springs a "Want to save?" dialog, we want
        // to keep the preview open until the save completes.
        BOOL mCloseAfterSave;
diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp
index 5f657d3..2bb0108 100644
--- a/linden/indra/newview/llpreviewgesture.cpp
+++ b/linden/indra/newview/llpreviewgesture.cpp
@@ -1590,6 +1590,11 @@ LLScrollListItem* LLPreviewGesture::addStep(const std::string& library_text)
        {
                step = new LLGestureStepWait();
        }
+        else
+        {
+                llerrs << "Unknown step type: " << library_text << llendl;;
+                return NULL;
+        }
        // Create an enabled item with this step
        LLSD row;
@@ -1645,7 +1650,7 @@ void LLPreviewGesture::onClickDelete(void* data)
        LLScrollListItem* item = self->mStepList->getFirstSelected();
        S32 selected_index = self->mStepList->getFirstSelectedIndex();
-        if (selected_index >= 0)
+        if (item && selected_index >= 0)
        {
                LLGestureStep* step = (LLGestureStep*)item->getUserdata();
                delete step;
diff --git a/linden/indra/newview/llpreviewnotecard.cpp b/linden/indra/newview/llpreviewnotecard.cpp
index 1c59bb4..471fe8a 100644
--- a/linden/indra/newview/llpreviewnotecard.cpp
+++ b/linden/indra/newview/llpreviewnotecard.cpp
@@ -296,11 +296,12 @@ void LLPreviewNotecard::loadAsset()
                                        {
                                                // The object that we're trying to look at disappeared, bail.
                                                llwarns << "Can't find object " << mObjectUUID << " associated with notecard." << llendl;
-                                    mAssetID.setNull();
+                                                mAssetID.setNull();
-                                    editor->setText("Unable to find object containing this note.");
+                                                editor->setText("Unable to find object containing this note.");
-                                    editor->makePristine();
+                                                editor->makePristine();
-                                    editor->setEnabled(FALSE);
+                                                editor->setEnabled(FALSE);
-                                    mAssetStatus = PREVIEW_ASSET_LOADED;
+                                                mAssetStatus = PREVIEW_ASSET_LOADED;
+                                                delete new_uuid;
                                                return;
                                        }
                                }
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index 39938d4..86c78a5 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -470,12 +470,14 @@ void LLScriptEdCore::updateDynamicHelp(BOOL immediate)
        LLFloater* help_floater = LLFloater::getFloaterByHandle(mLiveHelpHandle);
        if (!help_floater) return;
+#if LL_LIBXUL_ENABLED
        // update back and forward buttons
        LLButton* fwd_button = LLUICtrlFactory::getButtonByName(help_floater, "fwd_btn");
        LLButton* back_button = LLUICtrlFactory::getButtonByName(help_floater, "back_btn");
        LLWebBrowserCtrl* browser = LLUICtrlFactory::getWebBrowserCtrlByName(help_floater, "lsl_guide_html");
        back_button->setEnabled(browser->canNavigateBack());
        fwd_button->setEnabled(browser->canNavigateForward());
+#endif // LL_LIBXUL_ENABLED
        if (!immediate && !gSavedSettings.getBOOL("ScriptHelpFollowsCursor"))
        {
@@ -521,7 +523,7 @@ void LLScriptEdCore::updateDynamicHelp(BOOL immediate)
                        mLiveHelpTimer.stop();
                }
        }
-        else
+        else if (immediate)
        {
                setHelpPage("");
        }
@@ -543,7 +545,9 @@ void LLScriptEdCore::setHelpPage(const LLString& help_string)
        url_string.setArg("[LSL_STRING]", help_string);
        addHelpItemToHistory(help_string);
+#if LL_LIBXUL_ENABLED
        web_browser->navigateTo(url_string);
+#endif // LL_LIBXUL_ENABLED
 }
 void LLScriptEdCore::addHelpItemToHistory(const LLString& help_string)
@@ -675,8 +679,10 @@ void LLScriptEdCore::onBtnDynamicHelp(void* userdata)
        live_help_floater->childSetAction("back_btn", onClickBack, userdata);
        live_help_floater->childSetAction("fwd_btn", onClickForward, userdata);
+#if LL_LIBXUL_ENABLED
        LLWebBrowserCtrl* browser = LLUICtrlFactory::getWebBrowserCtrlByName(live_help_floater, "lsl_guide_html");
        browser->setAlwaysRefresh(TRUE);
+#endif // LL_LIBXUL_ENABLED
        LLComboBox* help_combo = LLUICtrlFactory::getComboBoxByName(live_help_floater, "history_combo");
        LLKeywordToken *token;
@@ -700,6 +706,7 @@ void LLScriptEdCore::onBtnDynamicHelp(void* userdata)
 //static 
 void LLScriptEdCore::onClickBack(void* userdata)
 {
+#if LL_LIBXUL_ENABLED
        LLScriptEdCore* corep = (LLScriptEdCore*)userdata;
        LLFloater* live_help_floater = LLFloater::getFloaterByHandle(corep->mLiveHelpHandle);
        if (live_help_floater)
@@ -710,11 +717,13 @@ void LLScriptEdCore::onClickBack(void* userdata)
                        browserp->navigateBack();
                }
        }
+#endif // LL_LIBXUL_ENABLED
 }
 //static 
 void LLScriptEdCore::onClickForward(void* userdata)
 {
+#if LL_LIBXUL_ENABLED
        LLScriptEdCore* corep = (LLScriptEdCore*)userdata;
        LLFloater* live_help_floater = LLFloater::getFloaterByHandle(corep->mLiveHelpHandle);
        if (live_help_floater)
@@ -725,6 +734,7 @@ void LLScriptEdCore::onClickForward(void* userdata)
                        browserp->navigateForward();
                }
        }
+#endif // LL_LIBXUL_ENABLED
 }
 // static
@@ -757,16 +767,17 @@ void LLScriptEdCore::onHelpComboCommit(LLUICtrl* ctrl, void* userdata)
        LLFloater* live_help_floater = LLFloater::getFloaterByHandle(corep->mLiveHelpHandle);
        if (live_help_floater)
        {
-                LLWebBrowserCtrl* web_browser = gUICtrlFactory->getWebBrowserCtrlByName(live_help_floater, "lsl_guide_html");
                LLString help_string = ctrl->getValue().asString();
                corep->addHelpItemToHistory(help_string);
+#if LL_LIBXUL_ENABLED
+                LLWebBrowserCtrl* web_browser = gUICtrlFactory->getWebBrowserCtrlByName(live_help_floater, "lsl_guide_html");
                LLUIString url_string = gSavedSettings.getString("LSLHelpURL");
                url_string.setArg("[APP_DIRECTORY]", gDirUtilp->getWorkingDir());
                url_string.setArg("[LSL_STRING]", help_string);
                web_browser->navigateTo(url_string);
+#endif // LL_LIBXUL_ENABLED
        }
 }
@@ -1336,10 +1347,6 @@ void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
                                {
                                        break;
                                }
-                                else if(!buffer)
-                                {
-                                        continue;
-                                }
                                else
                                {
                                        line.assign(buffer);
@@ -1709,7 +1716,7 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
                                mScriptEd->mEditor->setEnabled(FALSE);
                                mAssetStatus = PREVIEW_ASSET_LOADED;
                        }
-                        else if(mItem.notNull())
+                        else if(item && mItem.notNull())
                        {
                                // request the text from the object
                                LLUUID* user_data = new LLUUID(mItemID ^ mObjectID);
@@ -1835,6 +1842,7 @@ void LLLiveLSLEditor::loadScriptText(const char* filename)
        if(!filename)
        {
                llerrs << "Filename is Empty!" << llendl;
+                return;
        }
        FILE* file = LLFile::fopen(filename, "rb");             /*Flawfinder: ignore*/
        if(file)
@@ -2115,10 +2123,6 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
                                {
                                        break;
                                }
-                                else if(!buffer)
-                                {
-                                        continue;
-                                }
                                else
                                {
                                        line.assign(buffer);
diff --git a/linden/indra/newview/llpreviewtexture.cpp b/linden/indra/newview/llpreviewtexture.cpp
index 27a9b52..b59846d 100644
--- a/linden/indra/newview/llpreviewtexture.cpp
+++ b/linden/indra/newview/llpreviewtexture.cpp
@@ -388,29 +388,23 @@ void LLPreviewTexture::updateAspectRatio()
        // If that fails, cut width by half.
        S32 client_width = image_width;
        S32 horiz_pad = 2 * (LLPANEL_BORDER_WIDTH + PREVIEW_PAD) + PREVIEW_RESIZE_HANDLE_SIZE;
+        S32 vert_pad = PREVIEW_HEADER_SIZE + 2 * CLIENT_RECT_VPAD + LLPANEL_BORDER_WIDTH;       
        S32 screen_width = gViewerWindow->getWindowWidth();
        S32 max_client_width = screen_width - horiz_pad;
+        S32 max_client_height = gViewerWindow->getWindowHeight() - vert_pad;
+        F32 inv_aspect_ratio = (F32) image_height / (F32) image_width;
-        while (client_width > max_client_width)
+        while ((client_width > max_client_width) || ( llround(client_width * inv_aspect_ratio) > max_client_height ) )
        {
                client_width /= 2;
        }
-        // Demand width at least 128
-        if (client_width < 128)
-        {
-                client_width = 128;
-        }
        S32 view_width = client_width + horiz_pad;
        // Adjust the height based on the width computed above.
-        F32 inv_aspect_ratio = (F32) image_height / (F32) image_width;
        S32 client_height = llround(client_width * inv_aspect_ratio);
-        S32 view_height = 
+        S32 view_height = client_height + vert_pad;
-                PREVIEW_HEADER_SIZE +                           // header (includes top border)
-                client_height + 2 * CLIENT_RECT_VPAD +  // texture plus uniform spacing (which leaves room for resize handle)
-                LLPANEL_BORDER_WIDTH;                           // bottom border
        
        // set text on dimensions display (should be moved out of here and into a callback of some sort)
        childSetTextArg("dimensions", "[WIDTH]", llformat("%d", mImage->mFullWidth));
@@ -453,28 +447,43 @@ void LLPreviewTexture::updateAspectRatio()
                }
        }
-        // clamp texture size to fit within actual size of floater after attempting resize
+        
-        client_width = llmin(client_width, mRect.getWidth() - horiz_pad);
+        if (!mUserResized)
-        client_height = llmin(client_height, mRect.getHeight() - PREVIEW_HEADER_SIZE - (2 * CLIENT_RECT_VPAD) - LLPANEL_BORDER_WIDTH - info_height);
-        LLRect window_rect(0, mRect.getHeight(), mRect.getWidth(), 0);
-        window_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD);
-        window_rect.mBottom += PREVIEW_BORDER + button_height + CLIENT_RECT_VPAD + info_height + CLIENT_RECT_VPAD;
-        if (getHost())
        {
-                // try to keep aspect ratio when hosted, as hosting view can resize without user input
+                // clamp texture size to fit within actual size of floater after attempting resize
-                mClientRect.setLeftTopAndSize(window_rect.getCenterX() - (client_width / 2), window_rect.mTop, client_width, client_height);
+                client_width = llmin(client_width, mRect.getWidth() - horiz_pad);
+                client_height = llmin(client_height, mRect.getHeight() - PREVIEW_HEADER_SIZE 
+                                                - (2 * CLIENT_RECT_VPAD) - LLPANEL_BORDER_WIDTH - info_height);
+                
        }
        else
        {
-                mClientRect.setLeftTopAndSize(LLPANEL_BORDER_WIDTH + PREVIEW_PAD + 6,
+                client_width = mRect.getWidth() - horiz_pad;
-                                                mRect.getHeight() - (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD),
+                client_height = llround(client_width * inv_aspect_ratio);
-                                                mRect.getWidth() - horiz_pad,
+        }
-                                                client_height);
+        S32 max_height = mRect.getHeight() - PREVIEW_BORDER - button_height 
+                                    - CLIENT_RECT_VPAD - info_height - CLIENT_RECT_VPAD - PREVIEW_HEADER_SIZE;
+        max_height = llmax(max_height, 1);
+        if (client_height > max_height)
+        {
+                F32 aspect_ratio = (F32) image_width / (F32) image_height;
+                client_height = max_height;
+                client_width = llround(client_height * aspect_ratio);
        }
+        
+        LLRect window_rect(0, mRect.getHeight(), mRect.getWidth(), 0);
+        window_rect.mTop -= (PREVIEW_HEADER_SIZE + CLIENT_RECT_VPAD);
+        window_rect.mBottom += PREVIEW_BORDER + button_height + CLIENT_RECT_VPAD + info_height + CLIENT_RECT_VPAD;
+        // try to keep aspect ratio when hosted, as hosting view can resize without user input
+        mClientRect.setLeftTopAndSize(window_rect.getCenterX() - (client_width / 2), window_rect.mTop, client_width, client_height);
 }
 void LLPreviewTexture::loadAsset()
 {
        mImage = gImageList.getImage(mImageID, MIPMAP_TRUE, FALSE);
diff --git a/linden/indra/newview/llresourcedata.h b/linden/indra/newview/llresourcedata.h
new file mode 100644
index 0000000..9f5d329
--- /dev/null
+++ b/linden/indra/newview/llresourcedata.h
@@ -0,0 +1,44 @@
+/** 
+ * @file llresourcedata.h
+ * @brief Tracking object for uploads.
+ *
+ * Copyright (c) 2006-2007, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+ */
+#ifndef LLRESOURCEDATA_H
+#define LLRESOURCEDATA_H
+#include "llassetstorage.h"
+#include "llinventorytype.h"
+struct LLResourceData
+{
+        LLAssetInfo mAssetInfo;
+        LLAssetType::EType mPreferredLocation;
+        LLInventoryType::EType mInventoryType;
+        U32 mNextOwnerPerm;
+        void *mUserData;
+};
+#endif
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 598ded9..ec7ba78 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -91,7 +91,6 @@ const S32 MAX_ACTION_QUEUE_SIZE = 20;
 const S32 MAX_SILS_PER_FRAME = 50;
 const S32 MAX_OBJECTS_PER_PACKET = 254;
-extern LLGlobalEconomy *gGlobalEconomy;
 extern LLUUID                   gLastHitObjectID;
 extern LLVector3d               gLastHitObjectOffset;
@@ -208,6 +207,20 @@ LLSelectMgr::~LLSelectMgr()
 void LLSelectMgr::updateEffects()
 {
+        //keep reference grid objects active
+        for (LLSelectNode* grid_nodep = mGridObjects.getFirstNode();
+                grid_nodep;
+                grid_nodep = mGridObjects.getNextNode())
+        {
+                LLViewerObject* grid_object = grid_nodep->getObject();
+                LLDrawable* drawable = grid_object->mDrawable;
+                if (drawable)
+                {
+                        gPipeline.markMoved(drawable);
+                }
+        }
        if (mEffectsTimer.getElapsedTimeF32() > 1.f)
        {
                mSelectedObjects->updateEffects();
@@ -993,7 +1006,7 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
                LLVector3 first_grid_obj_pos = grid_object->getRenderPosition();
                LLVector3 min_extents(F32_MAX, F32_MAX, F32_MAX);
-                LLVector3 max_extents(F32_MIN, F32_MIN, F32_MIN);
+                LLVector3 max_extents(-min_extents);
                BOOL grid_changed = FALSE;
                LLSelectNode* grid_nodep;
                for (grid_nodep = mGridObjects.getFirstNode();
@@ -1001,34 +1014,23 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
                        grid_nodep = mGridObjects.getNextNode())
                        {
                                grid_object = grid_nodep->getObject();
+                                LLDrawable* drawable = grid_object->mDrawable;
-                                LLVector3 local_min_extents(F32_MAX, F32_MAX, F32_MAX);
+                                if (drawable)
-                                LLVector3 local_max_extents(F32_MIN, F32_MIN, F32_MIN);
-                                // *FIX: silhouette flag is insufficient as it gets
-                                // cleared by view update.
-                                if (!mGridValid || 
-                                        grid_object->isChanged(LLXform::SILHOUETTE)
-                                        || (grid_object->getParent() && grid_object->getParent()->isChanged(LLXform::SILHOUETTE)))
                                {
-                                        getSilhouetteExtents(grid_nodep, mGridRotation, local_min_extents, local_max_extents);
+                                        const LLVector3* ext = drawable->getSpatialExtents();
+                                        update_min_max(min_extents, max_extents, ext[0]);
+                                        update_min_max(min_extents, max_extents, ext[1]);
                                        grid_changed = TRUE;
-                                        LLVector3 object_offset = (grid_object->getRenderPosition() - first_grid_obj_pos) * ~mGridRotation;
-                                        local_min_extents += object_offset;
-                                        local_max_extents += object_offset;
                                }
-                                min_extents.mV[VX] = llmin(min_extents.mV[VX], local_min_extents.mV[VX]);
-                                min_extents.mV[VY] = llmin(min_extents.mV[VY], local_min_extents.mV[VY]);
-                                min_extents.mV[VZ] = llmin(min_extents.mV[VZ], local_min_extents.mV[VZ]);
-                                max_extents.mV[VX] = llmax(max_extents.mV[VX], local_max_extents.mV[VX]);
-                                max_extents.mV[VY] = llmax(max_extents.mV[VY], local_max_extents.mV[VY]);
-                                max_extents.mV[VZ] = llmax(max_extents.mV[VZ], local_max_extents.mV[VZ]);
                        }
                if (grid_changed)
                {
                        mGridOrigin = lerp(min_extents, max_extents, 0.5f);
-                        mGridOrigin = mGridOrigin * ~mGridRotation;
+                        LLDrawable* drawable = grid_object->mDrawable;
-                        mGridOrigin += first_grid_obj_pos;
+                        if (drawable && drawable->isActive())
+                        {
+                                mGridOrigin = mGridOrigin * grid_object->getRenderMatrix();
+                        }
                        mGridScale = (max_extents - min_extents) * 0.5f;
                }
        }
@@ -4939,66 +4941,6 @@ void LLSelectMgr::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_
        }
 }
-void LLSelectMgr::getSilhouetteExtents(LLSelectNode* nodep, const LLQuaternion& orientation, LLVector3& min_extents, LLVector3& max_extents)
-{
-        LLViewerObject* objectp = nodep->getObject();
-        if (objectp->mDrawable.isNull())
-        {
-                return;
-        }
-        
-        LLQuaternion test_rot = orientation * ~objectp->getRenderRotation();
-        LLVector3 x_axis_rot = LLVector3::x_axis * test_rot;
-        LLVector3 y_axis_rot = LLVector3::y_axis * test_rot;
-        LLVector3 z_axis_rot = LLVector3::z_axis * test_rot;
-        x_axis_rot.scaleVec(objectp->mDrawable->getScale());
-        y_axis_rot.scaleVec(objectp->mDrawable->getScale());
-        z_axis_rot.scaleVec(objectp->mDrawable->getScale());
-        generateSilhouette(nodep, objectp->mDrawable->getPositionAgent() + x_axis_rot * 100.f);
-        S32 num_vertices = nodep->mSilhouetteVertices.size();
-        if (num_vertices)
-        {
-                min_extents.mV[VY] = llmin(min_extents.mV[VY], nodep->mSilhouetteVertices[0] * y_axis_rot);
-                max_extents.mV[VY] = llmax(max_extents.mV[VY], nodep->mSilhouetteVertices[0] * y_axis_rot);
-                min_extents.mV[VZ] = llmin(min_extents.mV[VZ], nodep->mSilhouetteVertices[0] * z_axis_rot);
-                max_extents.mV[VZ] = llmax(min_extents.mV[VZ], nodep->mSilhouetteVertices[0] * z_axis_rot);
-                for (S32 vert = 1; vert < num_vertices; vert++)
-                {
-                        F32 y_pos = nodep->mSilhouetteVertices[vert] * y_axis_rot;
-                        F32 z_pos = nodep->mSilhouetteVertices[vert] * z_axis_rot;
-                        min_extents.mV[VY] = llmin(y_pos, min_extents.mV[VY]);
-                        max_extents.mV[VY] = llmax(y_pos, max_extents.mV[VY]);
-                        min_extents.mV[VZ] = llmin(z_pos, min_extents.mV[VZ]);
-                        max_extents.mV[VZ] = llmax(z_pos, max_extents.mV[VZ]);
-                }
-        }
-        generateSilhouette(nodep, objectp->mDrawable->getPositionAgent() + y_axis_rot * 100.f);
-        num_vertices = nodep->mSilhouetteVertices.size();
-        if (num_vertices)
-        {
-                min_extents.mV[VX] = llmin(min_extents.mV[VX], nodep->mSilhouetteVertices[0] * x_axis_rot);
-                max_extents.mV[VX] = llmax(max_extents.mV[VX], nodep->mSilhouetteVertices[0] * x_axis_rot);
-                for (S32 vert = 1; vert < num_vertices; vert++)
-                {
-                        F32 x_pos = nodep->mSilhouetteVertices[vert] * x_axis_rot;
-                        min_extents.mV[VX] = llmin(x_pos, min_extents.mV[VX]);
-                        max_extents.mV[VX] = llmax(x_pos, max_extents.mV[VX]);
-                }
-        }
-        generateSilhouette(nodep, gCamera->getOrigin());
-}
 //
 // Utility classes
 //
@@ -6479,6 +6421,8 @@ LLViewerObject* LLObjectSelection::getFirstDeleteableObject(BOOL get_root)
        }
        else
        {
+                // We've avoided this path for a while.  It may not work.
+                llwarns << "!get_root code path may have bitrotted." << llendl;
                for(LLViewerObject* current = getFirstObject();
                        current != NULL;
                        current = getNextObject())
diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index 98c0a7b..96db8e5 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -492,7 +492,6 @@ private:
        ESelectType getSelectTypeForObject(LLViewerObject* object);
        void addAsFamily(LLDynamicArray<LLViewerObject*>& objects, BOOL add_to_end = FALSE);
        void generateSilhouette(LLSelectNode *nodep, const LLVector3& view_point);
-        void getSilhouetteExtents(LLSelectNode* nodep, const LLQuaternion& orientation, LLVector3& min_extents, LLVector3& max_extents);
        // Send one message to each region containing an object on selection list.
        void sendListToRegions( const LLString& message_name,
                                                        void (*pack_header)(void *user_data), 
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index 46b9df9..d62a93e 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -1180,6 +1180,13 @@ void LLSpatialPartition::move(LLDrawable *drawablep, LLSpatialGroup *curp, BOOL
 {
        LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
        LLFastTimer t(LLFastTimer::FTM_UPDATE_MOVE);
+        // sanity check submitted by open source user bushing Spatula
+        // who was seeing crashing here. (See VWR-424 reported by Bunny Mayne)
+        if (!drawablep) {
+                OCT_ERRS << "LLSpatialPartition::move was passed a bad drawable." << llendl;
+                return;
+        }
                
        BOOL was_visible = curp ? curp->isVisible() : FALSE;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 585f769..e83aa0d 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -203,6 +203,7 @@ LLPointer<LLImageGL> gStartImageGL;
 static LLHost gAgentSimHost;
 static BOOL gSkipOptionalUpdate = FALSE;
+bool gUseQuickTime = true;
 bool gQuickTimeInitialized = false;
 static bool gGotUseCircuitCodeAck = false;
 LLString gInitialOutfit;
@@ -1867,7 +1868,8 @@ BOOL idle_startup()
                }
                #if LL_QUICKTIME_ENABLED        // windows only right now but will be ported to mac 
-                if (!gQuickTimeInitialized)
+                if (gUseQuickTime
+                        && !gQuickTimeInitialized)
                {
                        // initialize quicktime libraries (fails gracefully if quicktime not installed ($QUICKTIME)
                        llinfos << "Initializing QuickTime...." << llendl;
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index 59a433e..7c54b8c 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -82,6 +82,7 @@ enum EStartupState{
 // exorted symbol
 extern S32 gStartupState;
 extern BOOL gAgentMovementCompleted;
+extern bool gUseQuickTime;
 extern bool gQuickTimeInitialized;
 extern LLPointer<LLImageGL> gStartImageGL;
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index 58ac8c2..784765b 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -643,3 +643,8 @@ void LLStatusBar::onClickBuyLand(void*)
        gParcelMgr->selectParcelAt(gAgent.getPositionGlobal());
        gParcelMgr->startBuyLand();
 }
+BOOL can_afford_transaction(S32 cost)
+{
+        return((cost <= 0)||((gStatusBar) && (gStatusBar->getBalance() >=cost)));
+}
diff --git a/linden/indra/newview/llstatusbar.h b/linden/indra/newview/llstatusbar.h
index 52cc236..a072cd9 100644
--- a/linden/indra/newview/llstatusbar.h
+++ b/linden/indra/newview/llstatusbar.h
@@ -123,6 +123,9 @@ protected:
        LLFrameTimer*   mHealthTimer;
 };
+// *HACK: Status bar owns your cached money balance. JC
+BOOL can_afford_transaction(S32 cost);
 extern LLStatusBar *gStatusBar;
 #endif
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp
index 237d563..2005e39 100644
--- a/linden/indra/newview/lltexlayer.cpp
+++ b/linden/indra/newview/lltexlayer.cpp
@@ -277,7 +277,7 @@ BOOL LLTexLayerSetBuffer::render()
        {
                if (!success)
                {
-                        delete baked_bump_data;
+                        delete [] baked_bump_data;
                        llinfos << "Failed attempt to bake " << mTexLayerSet->getBodyRegion() << llendl;
                        mUploadPending = FALSE;
                }
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index 1436b62..b5c1ace 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -410,32 +410,35 @@ BOOL LLFloaterTexturePicker::handleKeyHere(KEY key, MASK mask, BOOL called_from_
 {
        LLFolderView* root_folder = mInventoryPanel->getRootFolder();
-        if (!called_from_parent && root_folder &&
+        if (root_folder && mSearchEdit)
-                mSearchEdit && mSearchEdit->hasFocus() &&
-                (key == KEY_RETURN || key == KEY_DOWN) && mask == MASK_NONE)
        {
-                if (!root_folder->getCurSelectedItem())
+                if (!called_from_parent && mSearchEdit->hasFocus() &&
+                    (key == KEY_RETURN || key == KEY_DOWN) &&
+                    mask == MASK_NONE)
                {
-                        LLFolderViewItem* itemp = root_folder->getItemByID(gAgent.getInventoryRootID());
+                        if (!root_folder->getCurSelectedItem())
-                        if (itemp)
                        {
-                                root_folder->setSelection(itemp, FALSE, FALSE);
+                                LLFolderViewItem* itemp = root_folder->getItemByID(gAgent.getInventoryRootID());
+                                if (itemp)
+                                {
+                                        root_folder->setSelection(itemp, FALSE, FALSE);
+                                }
                        }
+                        root_folder->scrollToShowSelection();
+                        
+                        // move focus to inventory proper
+                        root_folder->setFocus(TRUE);
+                        
+                        // treat this as a user selection of the first filtered result
+                        commitIfImmediateSet();
+                        
+                        return TRUE;
                }
-                root_folder->scrollToShowSelection();
-                // move focus to inventory proper
-                root_folder->setFocus(TRUE);
                
-                // treat this as a user selection of the first filtered result
+                if (root_folder->hasFocus() && key == KEY_UP)
-                commitIfImmediateSet();
+                {
+                        mSearchEdit->focusFirstItem(TRUE);
-                return TRUE;
+                }
-        }
-        if (root_folder->hasFocus() && key == KEY_UP)
-        {
-                mSearchEdit->focusFirstItem(TRUE);
        }
        return LLFloater::handleKeyHere(key, mask, called_from_parent);
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index 3956402..6196927 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -2575,7 +2575,13 @@ EAcceptance LLToolDragAndDrop::dad3dUpdateInventoryCategory(
        LLViewerObject* obj, S32 face, MASK mask, BOOL drop)
 {
        lldebugs << "LLToolDragAndDrop::dad3dUpdateInventoryCategory()" << llendl;
-        if(mSource != SOURCE_AGENT && mSource != SOURCE_LIBRARY)
+        if (NULL==obj)
+        {
+                llwarns << "obj is NULL; aborting func with ACCEPT_NO" << llendl;
+                return ACCEPT_NO;
+        }
+        if (mSource != SOURCE_AGENT && mSource != SOURCE_LIBRARY)
        {
                return ACCEPT_NO;
        }
@@ -2591,17 +2597,17 @@ EAcceptance LLToolDragAndDrop::dad3dUpdateInventoryCategory(
        LLInventoryModel::cat_array_t cats;
        LLInventoryModel::item_array_t items;
        gInventory.collectDescendentsIf(cat->getUUID(),
-                                                                        cats,
+                                        cats,
-                                                                        items,
+                                        items,
-                                                                        LLInventoryModel::EXCLUDE_TRASH,
+                                        LLInventoryModel::EXCLUDE_TRASH,
-                                                                        droppable);
+                                        droppable);
        cats.put(cat);
        if(droppable.countNoCopy() > 0)
        {
                llwarns << "*** Need to confirm this step" << llendl;
        }
        LLViewerObject* root_object = obj;
-        if (obj && obj->getParent())
+        if (obj->getParent())
        {
                LLViewerObject* parent_obj = (LLViewerObject*)obj->getParent();
                if (!parent_obj->isAvatar())
diff --git a/linden/indra/newview/lltoolgrab.cpp b/linden/indra/newview/lltoolgrab.cpp
index 502e2be..b56e762 100644
--- a/linden/indra/newview/lltoolgrab.cpp
+++ b/linden/indra/newview/lltoolgrab.cpp
@@ -180,6 +180,12 @@ BOOL LLToolGrab::handleObjectHit(LLViewerObject *objectp, S32 x, S32 y, MASK mas
                llinfos << "LLToolGrab handleObjectHit " << mMouseDownX << "," << mMouseDownY << llendl;
        }
+        if (NULL == objectp) // unexpected
+        {
+                llwarns << "objectp was NULL; returning FALSE" << llendl;
+                return FALSE;
+        }
        if (objectp->isAvatar())
        {
                if (gGrabTransientTool)
@@ -198,7 +204,7 @@ BOOL LLToolGrab::handleObjectHit(LLViewerObject *objectp, S32 x, S32 y, MASK mas
        // objectp = (LLViewerObject *)objectp->getRoot();
        LLViewerObject* parent = objectp->getRootEdit();
-        BOOL script_touch = (objectp && objectp->flagHandleTouch()) || (parent && parent->flagHandleTouch());
+        BOOL script_touch = (objectp->flagHandleTouch()) || (parent && parent->flagHandleTouch());
        // Clicks on scripted or physical objects are temporary grabs, so
        // not "Build mode"
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index adc46e2..7231286 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -390,11 +390,11 @@ U8 final_click_action(LLViewerObject* obj)
        if (obj->isAttachment()) return CLICK_ACTION_NONE;
        U8 click_action = CLICK_ACTION_TOUCH;
-        LLViewerObject* parent = (obj ? obj->getRootEdit() : NULL);
+        LLViewerObject* parent = obj->getRootEdit();
-        if ((obj && obj->getClickAction())
+        if (obj->getClickAction()
-                || (parent && parent->getClickAction()))
+            || (parent && parent->getClickAction()))
        {
-                if (obj && obj->getClickAction())
+                if (obj->getClickAction())
                {
                        click_action = obj->getClickAction();
                }
diff --git a/linden/indra/newview/lltoolpipette.cpp b/linden/indra/newview/lltoolpipette.cpp
index 139afc2..139afc2 100755..100644
--- a/linden/indra/newview/lltoolpipette.cpp
+++ b/linden/indra/newview/lltoolpipette.cpp
diff --git a/linden/indra/newview/lltoolpipette.h b/linden/indra/newview/lltoolpipette.h
index 1351084..1351084 100755..100644
--- a/linden/indra/newview/lltoolpipette.h
+++ b/linden/indra/newview/lltoolpipette.h
diff --git a/linden/indra/newview/llviewerassetstorage.cpp b/linden/indra/newview/llviewerassetstorage.cpp
index c7e9c97..95ef983 100644
--- a/linden/indra/newview/llviewerassetstorage.cpp
+++ b/linden/indra/newview/llviewerassetstorage.cpp
@@ -166,21 +166,22 @@ void LLViewerAssetStorage::storeAssetData(
        if(!filename)
        {
                llerrs << "No filename specified" << llendl;
+                return;
        }
        
        LLAssetID asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
        llinfos << "LLViewerAssetStorage::storeAssetData (legacy)" << asset_id << ":" << LLAssetType::lookup(asset_type) << llendl;
-        LLLegacyAssetRequest *legacy = new LLLegacyAssetRequest;
        llinfos << "ASSET_ID: " << asset_id << llendl;
-        legacy->mUpCallback = callback;
+        FILE* fp = LLFile::fopen(filename, "rb");
-        legacy->mUserData = user_data;
-        FILE* fp = LLFile::fopen(filename, "rb");               /* Flawfinder: ignore */
        if (fp)
        {
+                LLLegacyAssetRequest *legacy = new LLLegacyAssetRequest;
+                
+                legacy->mUpCallback = callback;
+                legacy->mUserData = user_data;
                LLVFile file(mVFS, asset_id, asset_type, LLVFile::WRITE);
                fseek(fp, 0, SEEK_END);
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 61285d5..08abd2d 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -240,6 +240,14 @@ void LLFloaterSettingsDebug::updateControl(LLControlBase* controlp)
        LLSpinCtrl* spinner3 = LLUICtrlFactory::getSpinnerByName(this, "val_spinner_3");
        LLSpinCtrl* spinner4 = LLUICtrlFactory::getSpinnerByName(this, "val_spinner_4");
        LLColorSwatchCtrl* color_swatch = LLUICtrlFactory::getColorSwatchByName(this, "color_swatch");
+        if (!spinner1 || !spinner2 || !spinner3 || !spinner4 || !color_swatch)
+        {
+                llwarns << "Could not find all desired controls by name"
+                        << llendl;
+                return;
+        }
        spinner1->setVisible(FALSE);
        spinner2->setVisible(FALSE);
        spinner3->setVisible(FALSE);
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index c2ef30a..fc288c0 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -564,6 +564,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
        glPushMatrix();
        glMatrixMode(GL_MODELVIEW);
        glPushMatrix();
+        
        if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices(FALSE))
        {
                LLCamera hud_cam = *gCamera;
@@ -598,7 +599,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield)
                        LLFastTimer ftm(LLFastTimer::FTM_REBUILD);
                        gPipeline.stateSort(hud_cam);
                }
-                
+                                
                gPipeline.renderGeom(hud_cam);
                //restore type mask
@@ -657,6 +658,7 @@ BOOL setup_hud_matrices(BOOL for_select)
                }
                LLBBox hud_bbox = my_avatarp->getHUDBBox();
+                
                // set up transform to encompass bounding box of HUD
                glMatrixMode(GL_PROJECTION);
                glLoadIdentity();
@@ -685,7 +687,7 @@ BOOL setup_hud_matrices(BOOL for_select)
                glLoadMatrixf(OGL_TO_CFR_ROTATION);             // Load Cory's favorite reference frame
                glTranslatef(-hud_bbox.getCenterLocal().mV[VX] + (hud_depth * 0.5f), 0.f, 0.f);
                glScalef(zoom_level, zoom_level, zoom_level);
+                
                return TRUE;
        }
        else
diff --git a/linden/indra/newview/llviewergenericmessage.cpp b/linden/indra/newview/llviewergenericmessage.cpp
index 56b168b..0e1ce49 100644
--- a/linden/indra/newview/llviewergenericmessage.cpp
+++ b/linden/indra/newview/llviewergenericmessage.cpp
@@ -1,9 +1,9 @@
-/** 
+/** 
- * @file llviewergenericmessage.cpp
+ * @file llviewergenericmessage.cpp
- * @brief Handle processing of "generic messages" which contain short lists of strings.
+ * @brief Handle processing of "generic messages" which contain short lists of strings.
- * @author James Cook
+ * @author James Cook
- *
+ *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * Copyright (c) 2007-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -24,74 +24,74 @@
 * 
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * COMPLETENESS OR PERFORMANCE.
- */
+ */
-#include "llviewerprecompiledheaders.h"
+#include "llviewerprecompiledheaders.h"
-#include "llviewergenericmessage.h"
+#include "llviewergenericmessage.h"
-#include "lldispatcher.h"
+#include "lldispatcher.h"
-#include "lluuid.h"
+#include "lluuid.h"
-#include "message.h"
+#include "message.h"
-#include "llagent.h"
+#include "llagent.h"
-LLDispatcher gGenericDispatcher;
+LLDispatcher gGenericDispatcher;
-void send_generic_message(const char* method,
+void send_generic_message(const char* method,
-                                                  const std::vector<std::string>& strings,
+                                                  const std::vector<std::string>& strings,
-                                                  const LLUUID& invoice)
+                                                  const LLUUID& invoice)
-{
+{
-        LLMessageSystem* msg = gMessageSystem;
+        LLMessageSystem* msg = gMessageSystem;
-        msg->newMessage("GenericMessage");
+        msg->newMessage("GenericMessage");
-        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->nextBlockFast(_PREHASH_AgentData);
-        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
+        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-        msg->nextBlock("MethodData");
+        msg->nextBlock("MethodData");
-        msg->addString("Method", method);
+        msg->addString("Method", method);
-        msg->addUUID("Invoice", invoice);
+        msg->addUUID("Invoice", invoice);
-        if(strings.empty())
+        if(strings.empty())
-        {
+        {
-                msg->nextBlock("ParamList");
+                msg->nextBlock("ParamList");
-                msg->addString("Parameter", NULL);
+                msg->addString("Parameter", NULL);
-        }
+        }
-        else
+        else
-        {
+        {
-                std::vector<std::string>::const_iterator it = strings.begin();
+                std::vector<std::string>::const_iterator it = strings.begin();
-                std::vector<std::string>::const_iterator end = strings.end();
+                std::vector<std::string>::const_iterator end = strings.end();
-                for(; it != end; ++it)
+                for(; it != end; ++it)
-                {
+                {
-                        msg->nextBlock("ParamList");
+                        msg->nextBlock("ParamList");
-                        msg->addString("Parameter", (*it).c_str());
+                        msg->addString("Parameter", (*it).c_str());
-                }
+                }
-        }
+        }
-        gAgent.sendReliableMessage();
+        gAgent.sendReliableMessage();
-}
+}
-void process_generic_message(LLMessageSystem* msg, void**)
+void process_generic_message(LLMessageSystem* msg, void**)
-{
+{
-        LLUUID agent_id;
+        LLUUID agent_id;
-        msg->getUUID("AgentData", "AgentID", agent_id);
+        msg->getUUID("AgentData", "AgentID", agent_id);
-        if (agent_id != gAgent.getID())
+        if (agent_id != gAgent.getID())
-        {
+        {
-                llwarns << "GenericMessage for wrong agent" << llendl;
+                llwarns << "GenericMessage for wrong agent" << llendl;
-                return;
+                return;
-        }
+        }
-        std::string request;
+        std::string request;
-        LLUUID invoice;
+        LLUUID invoice;
-        LLDispatcher::sparam_t strings;
+        LLDispatcher::sparam_t strings;
-        LLDispatcher::unpackMessage(msg, request, invoice, strings);
+        LLDispatcher::unpackMessage(msg, request, invoice, strings);
-        if(!gGenericDispatcher.dispatch(request, invoice, strings))
+        if(!gGenericDispatcher.dispatch(request, invoice, strings))
-        {
+        {
-                llwarns << "GenericMessage " << request << " failed to dispatch" 
+                llwarns << "GenericMessage " << request << " failed to dispatch" 
-                        << llendl;
+                        << llendl;
-        }
+        }
-}
+}
diff --git a/linden/indra/newview/llviewergenericmessage.h b/linden/indra/newview/llviewergenericmessage.h
index cf94d86..b0d02a2 100644
--- a/linden/indra/newview/llviewergenericmessage.h
+++ b/linden/indra/newview/llviewergenericmessage.h
@@ -1,9 +1,9 @@
-/** 
+/** 
- * @file llviewergenericmessage.h
+ * @file llviewergenericmessage.h
- * @brief Handle processing of "generic messages" which contain short lists of strings.
+ * @brief Handle processing of "generic messages" which contain short lists of strings.
- * @author James Cook
+ * @author James Cook
- *
+ *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * Copyright (c) 2007-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -24,23 +24,23 @@
 * 
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * COMPLETENESS OR PERFORMANCE.
- */
+ */
-#ifndef LLVIEWERGENERICMESSAGE_H
+#ifndef LLVIEWERGENERICMESSAGE_H
-#define LLVIEWERGENERICMESSAGE_H
+#define LLVIEWERGENERICMESSAGE_H
-class LLUUID;
+class LLUUID;
-class LLDispatcher;
+class LLDispatcher;
-void send_generic_message(const char* method,
+void send_generic_message(const char* method,
-                                                  const std::vector<std::string>& strings,
+                                                  const std::vector<std::string>& strings,
-                                                  const LLUUID& invoice = LLUUID::null);
+                                                  const LLUUID& invoice = LLUUID::null);
-void process_generic_message(LLMessageSystem* msg, void**);
+void process_generic_message(LLMessageSystem* msg, void**);
-extern LLDispatcher gGenericDispatcher;
+extern LLDispatcher gGenericDispatcher;
-#endif
+#endif
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index 9da84fa..4e87905 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -125,6 +125,9 @@ void LLViewerImageList::doPreloadImages()
        // Set the "white" image
        LLViewerImage::sWhiteImagep = preloadImage("white.tga", LLUUID::null, TRUE);;
+        // Speeds up startup by 4-5 seconds. JC
+        if (!gPreloadImages) return;
        // Preload some images
        preloadImage("button_anim_pause.tga", LLUUID::null, FALSE);
        preloadImage("button_anim_pause_selected.tga", LLUUID::null, FALSE);
@@ -1116,6 +1119,7 @@ LLPointer<LLImageJ2C> LLViewerImageList::convertToUploadFile(LLPointer<LLImageRa
 S32 LLViewerImageList::getMaxVideoRamSetting(S32 max)
 {
        const U32 vram_settings[] = { 16, 32, 64, 128, 256, 512 };
+        const S32 num_vram_settings = sizeof(vram_settings) / sizeof(vram_settings[0]);
        U32 max_vram;
        if (gGLManager.mVRAM != 0)
@@ -1144,8 +1148,9 @@ S32 LLViewerImageList::getMaxVideoRamSetting(S32 max)
        {
                max_vram = llmin(max_vram, (U32)((F32)system_ram/1.5f));
        }
        S32 idx;
-        for (idx=0; idx<=5; idx++)
+        for (idx=0; idx < num_vram_settings; idx++)
        {
                if (idx == max)
                        break;
@@ -1155,6 +1160,12 @@ S32 LLViewerImageList::getMaxVideoRamSetting(S32 max)
                        break;
                }
        }
+        if( idx == num_vram_settings )
+        {
+                idx = num_vram_settings - 1;
+        }
        return idx;
 }
@@ -1233,12 +1244,20 @@ void LLViewerImageList::receiveImageHeader(LLMessageSystem *msg, void **user_dat
        msg->getU16Fast(_PREHASH_ImageID, _PREHASH_Packets, packets);
        msg->getU32Fast(_PREHASH_ImageID, _PREHASH_Size, totalbytes);
-        U16 data_size = msg->getSizeFast(_PREHASH_ImageData, _PREHASH_Data); 
+        S32 data_size = msg->getSizeFast(_PREHASH_ImageData, _PREHASH_Data); 
        if (!data_size)
        {
                return;
        }
-        
+        if (data_size < 0)
+        {
+                // msg->getSizeFast() is probably trying to tell us there
+                // was an error.
+                llerrs << "image header chunk size was negative: "
+                       << data_size << llendl;
+                return;
+        }
        // this buffer gets saved off in the packet list
        U8 *data = new U8[data_size];
        msg->getBinaryDataFast(_PREHASH_ImageData, _PREHASH_Data, data, data_size);
@@ -1246,6 +1265,7 @@ void LLViewerImageList::receiveImageHeader(LLMessageSystem *msg, void **user_dat
        LLViewerImage *image = gImageList.getImage(id);
        if (!image)
        {
+                delete [] data;
                return;
        }
        image->mLastPacketTimer.reset();
@@ -1284,15 +1304,24 @@ void LLViewerImageList::receiveImagePacket(LLMessageSystem *msg, void **user_dat
        //llprintline("Start decode, image header...");
        msg->getUUIDFast(_PREHASH_ImageID, _PREHASH_ID, id);
        msg->getU16Fast(_PREHASH_ImageID, _PREHASH_Packet, packet_num);
-        U16 data_size = msg->getSizeFast(_PREHASH_ImageData, _PREHASH_Data); 
+        S32 data_size = msg->getSizeFast(_PREHASH_ImageData, _PREHASH_Data); 
        if (!data_size)
        {
                return;
        }
+        if (data_size < 0)
+        {
+                // msg->getSizeFast() is probably trying to tell us there
+                // was an error.
+                llerrs << "image data chunk size was negative: "
+                       << data_size << llendl;
+                return;
+        }
        if (data_size > MTUBYTES)
        {
                llerrs << "image data chunk too large: " << data_size << " bytes" << llendl;
+                return;
        }
        U8 *data = new U8[data_size];
        msg->getBinaryDataFast(_PREHASH_ImageData, _PREHASH_Data, data, data_size);
@@ -1300,6 +1329,7 @@ void LLViewerImageList::receiveImagePacket(LLMessageSystem *msg, void **user_dat
        LLViewerImage *image = gImageList.getImage(id);
        if (!image)
        {
+                delete [] data;
                return;
        }
        image->mLastPacketTimer.reset();
diff --git a/linden/indra/newview/llviewerinventory.cpp b/linden/indra/newview/llviewerinventory.cpp
index 8f23346..d271af5 100644
--- a/linden/indra/newview/llviewerinventory.cpp
+++ b/linden/indra/newview/llviewerinventory.cpp
@@ -462,10 +462,6 @@ bool LLViewerInventoryCategory::importFileLocal(FILE* fp)
                fgets(buffer, MAX_STRING, fp);
                sscanf( /* Flawfinder: ignore */
                        buffer, " %254s %254s", keyword, valuestr); 
-                if(!keyword)
-                {
-                        continue;
-                }
                if(0 == strcmp("{",keyword))
                {
                        continue;
diff --git a/linden/indra/newview/llviewerjointmesh.cpp b/linden/indra/newview/llviewerjointmesh.cpp
index 216e29f..c76990c 100644
--- a/linden/indra/newview/llviewerjointmesh.cpp
+++ b/linden/indra/newview/llviewerjointmesh.cpp
@@ -216,11 +216,11 @@ S32 LLViewerJointMesh::getBoundJointsByIndex(S32 index, S32 &joint_a, S32& joint
                if (render_datap->mSkinJoint)
                {
                        joint_b = render_datap->mSkinJoint->mJoint->mJointNum;
-                }
-                if (joint_a == -1)
+                        if (joint_a == -1)
-                {
+                        {
-                        joint_a = render_datap->mSkinJoint->mJoint->getParent()->mJointNum;
+                                joint_a = render_datap->mSkinJoint->mJoint->getParent()->mJointNum;
+                        }
                }
                num_joints++;
        }
diff --git a/linden/indra/newview/llviewerkeyboard.cpp b/linden/indra/newview/llviewerkeyboard.cpp
index f514b2e..fcb1550 100644
--- a/linden/indra/newview/llviewerkeyboard.cpp
+++ b/linden/indra/newview/llviewerkeyboard.cpp
@@ -717,15 +717,16 @@ S32 LLViewerKeyboard::loadBindings(const char *filename)
        S32 binding_count = 0;
        S32 line_count = 0;
-        fp = LLFile::fopen(filename, "r");      /* Flawfinder: ignore */
+        if(!filename)
+        {
+                llerrs << " No filename specified" << llendl;
+                return 0;
+        }
+        fp = LLFile::fopen(filename, "r");
        if (!fp)
        {
-                if(!filename)
-                {
-                        llerrs << " No filename specified" << llendl;
-                        return 0;
-                }
                return 0;
        }
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 64f1af8..1ff995e 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -34,15 +34,12 @@
 #include <iostream>
 #include <fstream>
 #include <sstream>
-#include <boost/tokenizer.hpp>
 // linden library includes
 #include "audioengine.h"
 #include "indra_constants.h"
-#include "llassetuploadresponders.h"
 #include "llassetstorage.h"
 #include "llchat.h"
-#include "lleconomy.h"
 #include "llfocusmgr.h"
 #include "llfontgl.h"
 #include "llinstantmessage.h"
@@ -57,7 +54,6 @@
 #include "raytrace.h"
 #include "llsdserialize.h"
 #include "lltimer.h"
-#include "vorbisencode.h"
 #include "llvfile.h"
 #include "llvolumemgr.h"
 #include "llwindow.h"   // for shell_open()
@@ -83,7 +79,6 @@
 #include "llfloater.h"
 #include "llfloaterabout.h"
 #include "llfloaterbuycurrency.h"
-#include "llfloateranimpreview.h"
 #include "llfloateravatarinfo.h"
 #include "llfloateravatartextures.h"
 #include "llfloaterbuildoptions.h"
@@ -104,21 +99,17 @@
 #include "llfloaterhtml.h"
 #include "llfloaterhtmlhelp.h"
 #include "llfloaterhtmlfind.h"
-#include "llfloaterimport.h"
 #include "llfloaterinspect.h"
 #include "llfloaterland.h"
 #include "llfloaterlandholdings.h"
 #include "llfloatermap.h"
-#include "llfloaterimagepreview.h"
 #include "llfloatermute.h"
-#include "llfloaternamedesc.h"
 #include "llfloateropenobject.h"
 #include "llfloaterpermissionsmgr.h"
 #include "llfloaterpreference.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterreporter.h"
 #include "llfloaterscriptdebug.h"
-#include "llfloatersnapshot.h"
 #include "llfloatertest.h"
 #include "llfloatertools.h"
 #include "llfloaterworldmap.h"
@@ -147,8 +138,6 @@
 #include "llnotify.h"
 #include "llpanelobject.h"
 #include "llparcel.h"
-#include "llpreviewscript.h"
-#include "llpreviewtexture.h"
 #include "llprimitive.h"
 #include "llresmgr.h"
 #include "llselectmgr.h"
@@ -176,8 +165,8 @@
 #include "llviewercamera.h"
 #include "llviewergenericmessage.h"
 #include "llviewergesture.h"
-#include "llviewerimagelist.h"
 #include "llviewerinventory.h"
+#include "llviewermenufile.h"   // init_menu_file()
 #include "llviewermessage.h"
 #include "llviewernetwork.h"
 #include "llviewerobjectlist.h"
@@ -402,7 +391,6 @@ void handle_god_request_avatar_geometry(void *);	// Hack for easy testing of new
 void reload_personal_settings_overrides(void *);
 void force_breakpoint(void *);
 void reload_vertex_shader(void *);
-void flush_animations(void *);
 void slow_mo_animations(void *);
 void handle_disconnect_viewer(void *);
@@ -467,6 +455,7 @@ void handle_dump_avatar_local_textures(void*);
 void handle_debug_avatar_textures(void*);
 void handle_grab_texture(void*);
 BOOL enable_grab_texture(void*);
+void handle_dump_region_object_cache(void*);
 BOOL menu_ui_enabled(void *user_data);
 void check_toggle_control( LLUICtrl *, void* user_data );
@@ -537,7 +526,7 @@ void pre_init_menus()
        LLMenuItemGL::setHighlightFGColor( color );
 }
-void initialize_menu_actions();
+void initialize_menus();
 //-----------------------------------------------------------------------------
 // Initialize main menus
@@ -565,7 +554,7 @@ void init_menus()
        LLMenuGL::sMenuContainer = gMenuHolder;
        // Initialize actions
-        initialize_menu_actions();
+        initialize_menus();
        ///
        /// Popup menu
@@ -965,6 +954,8 @@ void init_debug_world_menu(LLMenuGL* menu)
                                                                           NULL, 
                                                                           &menu_check_control,
                                                                           (void*)"FixedWeather"));
+        menu->append(new LLMenuItemCallGL("Dump Region Object Cache",
+                &handle_dump_region_object_cache, NULL, NULL));
        menu->createJumpKeys();
 }
@@ -1293,7 +1284,6 @@ void init_debug_avatar_menu(LLMenuGL* menu)
        menu->append(new LLMenuItemCallGL("Force Params to Default", &LLAgent::clearVisualParams, NULL));
        menu->append(new LLMenuItemCallGL("Reload Vertex Shader", &reload_vertex_shader, NULL));
        menu->append(new LLMenuItemToggleGL("Animation Info", &LLVOAvatar::sShowAnimationDebug));
-        menu->append(new LLMenuItemCallGL("Flush Animations", &flush_animations, NULL));
        menu->append(new LLMenuItemCallGL("Slow Motion Animations", &slow_mo_animations, NULL));
        menu->append(new LLMenuItemToggleGL("Show Look At", &LLHUDEffectLookAt::sDebugLookAt));
        menu->append(new LLMenuItemToggleGL("Show Point At", &LLHUDEffectPointAt::sDebugPointAt));
@@ -2041,13 +2031,13 @@ class LLAvatarDebug : public view_listener_t
                if( avatar )
                {
                        avatar->dumpLocalTextures();
+                        llinfos << "Dumping temporary asset data to simulator logs for avatar " << avatar->getID() << llendl;
+                        std::vector<std::string> strings;
+                        strings.push_back(avatar->getID().asString());
+                        LLUUID invoice;
+                        send_generic_message("dumptempassetdata", strings, invoice);
+                        LLFloaterAvatarTextures::show( avatar->getID() );
                }
-                llinfos << "Dumping temporary asset data to simulator logs for avatar " << avatar->getID() << llendl;
-                std::vector<std::string> strings;
-                strings.push_back(avatar->getID().asString());
-                LLUUID invoice;
-                send_generic_message("dumptempassetdata", strings, invoice);
-                LLFloaterAvatarTextures::show( avatar->getID() );
                return true;
        }
 };
@@ -2337,16 +2327,6 @@ void handle_buy_contents(LLSaleInfo sale_info)
        LLFloaterBuyContents::show(sale_info);
 }
-class LLFileEnableSaveAs : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                bool new_value = gFloaterView->getFrontmost() && gFloaterView->getFrontmost()->canSaveAs();
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-                return true;
-        }
-};
 void handle_region_dump_temp_asset_data(void*)
 {
        llinfos << "Dumping temporary asset data to simulator logs" << llendl;
@@ -2397,6 +2377,15 @@ void handle_dump_capabilities_info(void *)
        }
 }
+void handle_dump_region_object_cache(void*)
+{
+        LLViewerRegion* regionp = gAgent.getRegion();
+        if (regionp)
+        {
+                regionp->dumpCache();
+        }
+}
 void handle_dump_focus(void *)
 {
        LLView *view = gFocusMgr.getKeyboardFocus();
@@ -4279,7 +4268,10 @@ void show_buy_currency(const char* extra)
        mesg << "Go to " << BUY_CURRENCY_URL << "\nfor information on purchasing currency?";
        LLString::format_map_t args;
-        args["[EXTRA]"] = extra;
+        if (extra != NULL)
+        {
+                args["[EXTRA]"] = extra;
+        }
        args["[URL]"] = BUY_CURRENCY_URL;
        gViewerWindow->alertXml("PromptGoToCurrencyPage", args, 
                callback_show_buy_currency);
@@ -4876,906 +4868,6 @@ void toggle_map( void* user_data )
        }
 }
-/**
-   char* upload_pick(void* data)
-   If applicable, brings up a file chooser in which the user selects a file
-   to upload for a particular task.  If the file is valid for the given action,
-   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)
-{
-        if( gAgent.cameraMouselook() )
-        {
-                gAgent.changeCameraToDefault();
-                // This doesn't seem necessary. JC
-                // display();
-        }
-        LLFilePicker::ELoadFilter type;
-        if(data)
-        {
-                type = (LLFilePicker::ELoadFilter)((intptr_t)data);
-        }
-        else
-        {
-                type = LLFilePicker::FFLOAD_ALL;
-        }
-        LLFilePicker& picker = LLFilePicker::instance();
-        if (!picker.getOpenFile(type))
-        {
-                llinfos << "Couldn't import objects from file" << llendl;
-                return NULL;
-        }
-        const char* filename = picker.getFirstFile();
-        const char* ext = strrchr(filename, '.');
-        //strincmp doesn't like NULL pointers
-        if (ext == NULL)
-        {
-                const char* short_name = strrchr(filename,
-                                                                                 *gDirUtilp->getDirDelimiter().c_str());
-                
-                // No extension
-                LLStringBase<char>::format_map_t args;
-                args["[FILE]"] = LLString(short_name + 1);
-                gViewerWindow->alertXml("NoFileExtension", args);
-                return NULL;
-        }
-        else
-        {
-                //so there is an extension
-                //loop over the valid extensions and compare to see
-                //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);
-                BOOL ext_valid = FALSE;
-                
-                typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-                boost::char_separator<char> sep(" ");
-                tokenizer tokens(valid_extensions, sep);
-                tokenizer::iterator token_iter;
-                //now loop over all valid file extensions
-                //and compare them to the extension of the file
-                //to be uploaded
-                for( token_iter = tokens.begin();
-                         token_iter != tokens.end() && ext_valid != TRUE;
-                         ++token_iter)
-                {
-                        const char* cur_token = token_iter->c_str();
-                        if (0 == strnicmp(cur_token, ext, strlen(cur_token)) ||         /* Flawfinder: ignore */
-                                0 == strnicmp(cur_token, "*.*", strlen(cur_token)))             /* Flawfinder: ignore */
-                        {
-                                //valid extension
-                                //or the acceptable extension is any
-                                ext_valid = TRUE;
-                        }
-                }//end for (loop over all tokens)
-                if (ext_valid == FALSE)
-                {
-                        //should only get here if the extension exists
-                        //but is invalid
-                        LLStringBase<char>::format_map_t args;
-                        args["[EXTENSION]"] = ext;
-                        args["[VALIDS]"] = valids;
-                        gViewerWindow->alertXml("InvalidFileExtension", args);
-                        return NULL;
-                }
-        }//end else (non-null extension)
-        //valid file extension
-        
-        //now we check to see
-        //if the file is actually a valid image/sound/etc.
-        if (type == LLFilePicker::FFLOAD_WAV)
-        {
-                // pre-qualify wavs to make sure the format is acceptable
-                char error_msg[MAX_STRING];             /* Flawfinder: ignore */        
-                if (check_for_invalid_wav_formats(filename,error_msg))
-                {
-                        llinfos << error_msg << ": " << filename << llendl;
-                        LLStringBase<char>::format_map_t args;
-                        args["[FILE]"] = filename;
-                        gViewerWindow->alertXml( error_msg, args );
-                        return NULL;
-                }
-        }//end if a wave/sound file
-        
-        return filename;
-}
-void handle_upload_object(void* data)
-{
-        const char* filename = upload_pick(data);
-        if (filename)
-        {
-                // start the import
-                LLFloaterImport* floaterp = new LLFloaterImport(filename);
-                gUICtrlFactory->buildFloater(floaterp, "floater_import.xml");
-        }
-}
-class LLFileUploadImage : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                const char* filename = upload_pick((void *)(S32)LLFilePicker::FFLOAD_IMAGE);
-                if (filename)
-                {
-                        LLFloaterImagePreview* floaterp = new LLFloaterImagePreview(filename);
-                        gUICtrlFactory->buildFloater(floaterp, "floater_image_preview.xml");
-                }
-                return TRUE;
-        }
-};
-class LLFileUploadSound : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                const char* filename = upload_pick((void*)((S32)LLFilePicker::FFLOAD_WAV));
-                if (filename)
-                {
-                        LLFloaterNameDesc* floaterp = new LLFloaterNameDesc(filename);
-                        gUICtrlFactory->buildFloater(floaterp, "floater_sound_preview.xml");
-                }
-                return true;
-        }
-};
-class LLFileUploadAnim : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                const char* filename = upload_pick((void*)((S32)LLFilePicker::FFLOAD_ANIM));
-                if (filename)
-                {
-                        LLFloaterAnimPreview* floaterp = new LLFloaterAnimPreview(filename);
-                        gUICtrlFactory->buildFloater(floaterp, "floater_animation_preview.xml");
-                }
-                return true;
-        }
-};
-class LLFileUploadBulk : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                if( gAgent.cameraMouselook() )
-                {
-                        gAgent.changeCameraToDefault();
-                }
-                // TODO:
-                // Iterate over all files
-                // Check extensions for uploadability, cost
-                // Check user balance for entire cost
-                // Charge user entire cost
-                // Loop, uploading
-                // If an upload fails, refund the user for that one
-                //
-                // Also fix single upload to charge first, then refund
-                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 );
-                        upload_new_resource(filename, asset_name, asset_name, 0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE); // file
-                }
-                else
-                {
-                        llinfos << "Couldn't import objects from file" << llendl;
-                }
-                return true;
-        }
-};
-void upload_error(const char* error_message, const char* label, const std::string filename, const LLStringBase<char>::format_map_t args) 
-{
-        llwarns << error_message << llendl;
-        gViewerWindow->alertXml(label, args);
-        if(remove(filename.c_str()) == -1)
-        {
-                lldebugs << "unable to remove temp file" << llendl;
-        }
-        LLFilePicker::instance().reset();                                               
-}
-class LLFileEnableCloseWindow : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                bool new_value = gFloaterView->getFocusedFloater() != NULL || gSnapshotFloaterView->getFocusedFloater() != NULL;
-                // horrendously opaque, this code
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-                return true;
-        }
-};
-class LLFileCloseWindow : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLFloater::closeFocusedFloater();
-                return true;
-        }
-};
-class LLFileSaveTexture : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLFloater* top = gFloaterView->getFrontmost();
-                if (top)
-                {
-                        top->saveAs();
-                }
-                return true;
-        }
-};
-class LLFileTakeSnapshot : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLFloaterSnapshot::show(NULL);
-                return true;
-        }
-};
-class LLFileTakeSnapshotToDisk : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLPointer<LLImageRaw> raw = new LLImageRaw;
-                S32 width = gViewerWindow->getWindowDisplayWidth();
-                S32 height = gViewerWindow->getWindowDisplayHeight();
-                if (gSavedSettings.getBOOL("HighResSnapshot"))
-                {
-                        width *= 2;
-                        height *= 2;
-                }
-                if (gViewerWindow->rawSnapshot(raw,
-                                                                           width,
-                                                                           height,
-                                                                           TRUE,
-                                                                           gSavedSettings.getBOOL("RenderUIInSnapshot"),
-                                                                           FALSE))
-                {
-                        if (!gQuietSnapshot)
-                        {
-                                gViewerWindow->playSnapshotAnimAndSound();
-                        }
-                        LLImageBase::setSizeOverride(TRUE);
-                        gViewerWindow->saveImageNumbered(raw);
-                        LLImageBase::setSizeOverride(FALSE);
-                }
-                return true;
-        }
-};
-class LLFileSaveMovie : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLViewerWindow::saveMovieNumbered(NULL);
-                return true;
-        }
-};
-class LLFileSetWindowSize : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                LLString size = userdata.asString();
-                S32 width, height;
-                sscanf(size.c_str(), "%d,%d", &width, &height);
-                LLViewerWindow::movieSize(width, height);
-                return true;
-        }
-};
-class LLFileQuit : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                app_request_quit();
-                return true;
-        }
-};
-void handle_upload(void* data)
-{
-        const char* filename = upload_pick(data);
-        if (filename)
-        {
-                LLFloaterNameDesc* floaterp = new LLFloaterNameDesc(filename);
-                gUICtrlFactory->buildFloater(floaterp, "floater_name_description.xml");
-        }
-}
-void handle_compress_image(void*)
-{
-        LLFilePicker& picker = LLFilePicker::instance();
-        if (picker.getOpenFile(LLFilePicker::FFLOAD_IMAGE))
-        {
-                std::string infile(picker.getFirstFile());
-                std::string outfile = infile + ".j2c";
-                llinfos << "Input:  " << infile << llendl;
-                llinfos << "Output: " << outfile << llendl;
-                BOOL success;
-                success = LLViewerImageList::createUploadFile(infile, outfile, IMG_CODEC_TGA);
-                if (success)
-                {
-                        llinfos << "Compression complete" << llendl;
-                }
-                else
-                {
-                        llinfos << "Compression failed: " << LLImageBase::getLastError() << llendl;
-                }
-        }
-}
-void upload_new_resource(const LLString& 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,
-                                                 LLAssetStorage::LLStoreAssetCallback callback,
-                                                 void *userdata)
-{       
-        // Generate the temporary UUID.
-        LLString filename = gDirUtilp->getTempFilename();
-        LLTransactionID tid;
-        LLAssetID uuid;
-        
-        LLStringBase<char>::format_map_t args;
-        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;
-        BOOL error = FALSE;
-        
-        if (ext.empty())
-        {
-                LLString::size_type offset = filename.find_last_of(gDirUtilp->getDirDelimiter());
-                if (offset != LLString::npos)
-                        offset++;
-                LLString short_name = filename.substr(offset);
-                
-                // No extension
-                snprintf(error_message,         /* Flawfinder: ignore */
-                                MAX_STRING,
-                                "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 )
-        {
-                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 */
-                                        src_filename.c_str(), LLImageBase::getLastError().c_str());
-                        args["[FILE]"] = src_filename;
-                        args["[ERROR]"] = LLImageBase::getLastError();
-                        upload_error(error_message, "ProblemWithFile", filename, args);
-                        return;
-                }
-        }
-        else if( LLString::compareInsensitive(ext.c_str(),".tga") == 0 )
-        {
-                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 */
-                                        src_filename.c_str(), LLImageBase::getLastError().c_str());
-                        args["[FILE]"] = src_filename;
-                        args["[ERROR]"] = LLImageBase::getLastError();
-                        upload_error(error_message, "ProblemWithFile", filename, args);
-                        return;
-                }
-        }
-        else if( LLString::compareInsensitive(ext.c_str(),".jpg") == 0 || LLString::compareInsensitive(ext.c_str(),".jpeg") == 0)
-        {
-                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 */
-                                        src_filename.c_str(), LLImageBase::getLastError().c_str());
-                        args["[FILE]"] = src_filename;
-                        args["[ERROR]"] = LLImageBase::getLastError();
-                        upload_error(error_message, "ProblemWithFile", filename, args);
-                        return;
-                }
-        }
-        else if(LLString::compareInsensitive(ext.c_str(),".wav") == 0)
-        {
-                asset_type = LLAssetType::AT_SOUND;  // tag it as audio
-                S32 encode_result = 0;
-                S32 bitrate = 128;
-                if (compression_info)
-                {
-                        bitrate = compression_info;
-                }
-                llinfos << "Attempting to encode wav as an ogg file at " << bitrate << "kbps" << llendl;
-                encode_result = encode_vorbis_file_at(src_filename.c_str(), filename.c_str(), bitrate*1000);
-                
-                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 */
-                                        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 */
-                                        args["[FILE]"] = src_filename;
-                                        upload_error(error_message, "UnknownVorbisEncodeFailure", filename, args);
-                                        break;  
-                        }       
-                        return;
-                }
-        }
-        else if(LLString::compareInsensitive(ext.c_str(),".tmp") == 0)          
-        {               
-                // This is a generic .lin resource file         
-         asset_type = LLAssetType::AT_OBJECT;           
-         FILE* in = LLFile::fopen(src_filename.c_str(), "rb");          /* Flawfinder: ignore */                
-         if (in)                
-         {              
-                 // read in the file header             
-                 char buf[16384];               /* Flawfinder: ignore */        
-                 S32 read;              /* Flawfinder: ignore */                
-                 S32  version;          
-                 if (fscanf(in, "LindenResource\nversion %d\n", &version))              
-                 {              
-                         if (2 == version)              
-                         {
-                                                                // *NOTE: This buffer size is hard coded into scanf() below.
-                                 char label[MAX_STRING];                /* Flawfinder: ignore */                
-                                 char value[MAX_STRING];                /* Flawfinder: ignore */                
-                                 S32  tokens_read;              
-                                 while (fgets(buf, 1024, in))           
-                                 {              
-                                         label[0] = '\0';               
-                                         value[0] = '\0';               
-                                         tokens_read = sscanf(  /* Flawfinder: ignore */
-                                                                                         buf,
-                                                                                         "%254s %254s\n",
-                                                                                         label, value);         
-                                         llinfos << "got: " << label << " = " << value          
-                                                         << llendl;             
-                                         if (EOF == tokens_read)                
-                                         {              
-                                                 fclose(in);            
-                                                 snprintf(error_message, MAX_STRING, "corrupt resource file: %s", src_filename.c_str());                /* Flawfinder: ignore */
-                                                                                                 args["[FILE]"] = src_filename;
-                                                                                                 upload_error(error_message, "CorruptResourceFile", filename, args);
-                                                 return;
-                                         }              
-                                         if (2 == tokens_read)          
-                                         {              
-                                                 if (! strcmp("type", label))           
-                                                 {              
-                                                         asset_type = (LLAssetType::EType)(atoi(value));                
-                                                 }              
-                                         }              
-                                         else           
-                                         {              
-                                                 if (! strcmp("_DATA_", label))         
-                                                 {              
-                                                         // below is the data section           
-                                                         break;         
-                                                 }              
-                                         }              
-                                         // other values are currently discarded                
-                                 }              
-                         }              
-                         else           
-                         {              
-                                 fclose(in);            
-                                 snprintf(error_message, MAX_STRING, "unknown linden resource file version in file: %s", src_filename.c_str());         /* Flawfinder: ignore */
-                                                                 args["[FILE]"] = src_filename;
-                                                                 upload_error(error_message, "UnknownResourceFileVersion", filename, args);
-                                 return;
-                         }              
-                 }              
-                 else           
-                 {              
-                         // this is an original binary formatted .lin file              
-                         // start over at the beginning of the file             
-                         fseek(in, 0, SEEK_SET);                
-                         const S32 MAX_ASSET_DESCRIPTION_LENGTH = 256;          
-                         const S32 MAX_ASSET_NAME_LENGTH = 64;          
-                         S32 header_size = 34 + MAX_ASSET_DESCRIPTION_LENGTH + MAX_ASSET_NAME_LENGTH;           
-                         S16     type_num;              
-                         // read in and throw out most of the header except for the type                
-                         fread(buf, header_size, 1, in);                
-                         memcpy(&type_num, buf + 16, sizeof(S16));              /* Flawfinder: ignore */                
-                         asset_type = (LLAssetType::EType)type_num;             
-                 }              
-                 // copy the file's data segment into another file for uploading                
-                 FILE* out = LLFile::fopen(filename.c_str(), "wb");             /* Flawfinder: ignore */        
-                 if (out)               
-                 {              
-                         while((read = fread(buf, 1, 16384, in)))               /* Flawfinder: ignore */                
-                         {              
-                                 fwrite(buf, 1, read, out);             /* Flawfinder: ignore */                                
-                         }              
-                         fclose(out);           
-                 }              
-                 else           
-                 {              
-                         fclose(in);            
-                         snprintf(error_message, MAX_STRING, "Unable to create output file: %s", filename.c_str());             /* Flawfinder: ignore */
-                                                 args["[FILE]"] = filename;
-                                                 upload_error(error_message, "UnableToCreateOutputFile", filename, args);
-                         return;
-                 }              
-                 fclose(in);            
-         }              
-         else           
-         {              
-                 llinfos << "Couldn't open .lin file " << src_filename << llendl;               
-         }              
-        }
-        else if (LLString::compareInsensitive(ext.c_str(),".bvh") == 0)
-        {
-                snprintf(error_message, MAX_STRING, "We do not currently support bulk upload of animation files\n");            /* Flawfinder: ignore */
-                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 */
-                error = TRUE;;
-        }
-        // gen a new transaction ID for this asset
-        tid.generate();
-        if (!error)
-        {
-                uuid = tid.makeAssetID(gAgent.getSecureSessionID());
-                // copy this file into the vfs for upload
-                S32 file_size;
-                apr_file_t* fp = ll_apr_file_open(filename, LL_APR_RB, &file_size);
-                if (fp)
-                {
-                        LLVFile file(gVFS, uuid, asset_type, LLVFile::WRITE);
-                        file.setMaxSize(file_size);
-                        const S32 buf_size = 65536;
-                        U8 copy_buf[buf_size];
-                        while ((file_size = ll_apr_file_read(fp, copy_buf, buf_size)))
-                        {
-                                file.write(copy_buf, file_size);
-                        }
-                        apr_file_close(fp);
-                }
-                else
-                {
-                        snprintf(error_message, MAX_STRING, "Unable to access output file: %s", filename.c_str());              /* Flawfinder: ignore */
-                        error = TRUE;
-                }
-        }
-        if (!error)
-        {
-                LLString t_disp_name = display_name;
-                if (t_disp_name.empty())
-                {
-                        t_disp_name = src_filename;
-                }
-                upload_new_resource(tid, asset_type, name, desc, compression_info, // tid
-                                                        destination_folder_type, inv_type, next_owner_perm,
-                                                        display_name, callback, userdata);
-        }
-        else
-        {
-                llwarns << error_message << llendl;
-                LLStringBase<char>::format_map_t args;
-                args["[ERROR_MESSAGE]"] = error_message;
-                gViewerWindow->alertXml("ErrorMessage", args);
-                if(LLFile::remove(filename.c_str()) == -1)
-                {
-                        lldebugs << "unable to remove temp file" << llendl;
-                }
-                LLFilePicker::instance().reset();
-        }
-}
-void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_type,
-                                                 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,
-                                                 LLAssetStorage::LLStoreAssetCallback callback,
-                                                 void *userdata)
-{
-        LLAssetID uuid = tid.makeAssetID(gAgent.getSecureSessionID());
-        
-        if( LLAssetType::AT_SOUND == asset_type )
-        {
-                gViewerStats->incStat(LLViewerStats::ST_UPLOAD_SOUND_COUNT );
-        }
-        else
-        if( LLAssetType::AT_TEXTURE == asset_type )
-        {
-                gViewerStats->incStat(LLViewerStats::ST_UPLOAD_TEXTURE_COUNT );
-        }
-        else
-        if( LLAssetType::AT_ANIMATION == asset_type)
-        {
-                gViewerStats->incStat(LLViewerStats::ST_UPLOAD_ANIM_COUNT );
-        }
-        if(LLInventoryType::IT_NONE == inv_type)
-        {
-                inv_type = LLInventoryType::defaultForAssetType(asset_type);
-        }
-        LLString::stripNonprintable(name);
-        LLString::stripNonprintable(desc);
-        if(name.empty())
-        {
-                name = "(No Name)";
-        }
-        if(desc.empty())
-        {
-                desc = "(No Description)";
-        }
-        
-        // At this point, we're ready for the upload.
-        LLString upload_message = "Uploading...\n\n";
-        upload_message.append(display_name);
-        LLUploadDialog::modalUploadDialog(upload_message);
-        llinfos << "*** Uploading: " << llendl;
-        llinfos << "Type: " << LLAssetType::lookup(asset_type) << llendl;
-        llinfos << "UUID: " << uuid << llendl;
-        llinfos << "Name: " << name << llendl;
-        llinfos << "Desc: " << desc << llendl;
-        lldebugs << "Folder: " << gInventory.findCategoryUUIDForType(destination_folder_type) << llendl;
-        lldebugs << "Asset Type: " << LLAssetType::lookup(asset_type) << llendl;
-        std::string url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
-        if (!url.empty())
-        {
-                llinfos << "New Agent Inventory via capability" << llendl;
-                LLSD body;
-                body["folder_id"] = gInventory.findCategoryUUIDForType((destination_folder_type == LLAssetType::AT_NONE) ? asset_type : destination_folder_type);
-                body["asset_type"] = LLAssetType::lookup(asset_type);
-                body["inventory_type"] = LLInventoryType::lookup(inv_type);
-                body["name"] = name;
-                body["description"] = desc;
-                
-                std::ostringstream llsdxml;
-                LLSDSerialize::toXML(body, llsdxml);
-                lldebugs << "posting body to capability: " << llsdxml.str() << llendl;
-                LLHTTPClient::post(url, body, new LLNewAgentInventoryResponder(body, uuid, asset_type));
-        }
-        else
-        {
-                llinfos << "NewAgentInventory capability not found, new agent inventory via asset system." << llendl;
-                // check for adequate funds
-                // TODO: do this check on the sim
-                if (LLAssetType::AT_SOUND == asset_type ||
-                        LLAssetType::AT_TEXTURE == asset_type ||
-                        LLAssetType::AT_ANIMATION == asset_type)
-                {
-                        S32 upload_cost = gGlobalEconomy->getPriceUpload();
-                        S32 balance = gStatusBar->getBalance();
-                        if (balance < upload_cost)
-                        {
-                                // insufficient funds, bail on this upload
-                                LLFloaterBuyCurrency::buyCurrency("Uploading costs", upload_cost);
-                                return;
-                        }
-                }
-                LLResourceData* data = new LLResourceData;
-                data->mAssetInfo.mTransactionID = tid;
-                data->mAssetInfo.mUuid = uuid;
-                data->mAssetInfo.mType = asset_type;
-                data->mAssetInfo.mCreatorID = gAgentID;
-                data->mInventoryType = inv_type;
-                data->mNextOwnerPerm = next_owner_perm;
-                data->mUserData = userdata;
-                data->mAssetInfo.setName(name);
-                data->mAssetInfo.setDescription(desc);
-                data->mPreferredLocation = destination_folder_type;
-                LLAssetStorage::LLStoreAssetCallback asset_callback = &upload_done_callback;
-                if (callback)
-                {
-                        asset_callback = callback;
-                }
-                gAssetStorage->storeAssetData(data->mAssetInfo.mTransactionID, data->mAssetInfo.mType,
-                                                                                asset_callback,
-                                                                                (void*)data,
-                                                                                FALSE);
-        }
-}
-void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result) // StoreAssetData callback (fixed)
-{
-        LLResourceData* data = (LLResourceData*)user_data;
-        //LLAssetType::EType pref_loc = data->mPreferredLocation;
-        BOOL is_balance_sufficient = TRUE;
-        if(result >= 0)
-        {
-                LLAssetType::EType dest_loc = (data->mPreferredLocation == LLAssetType::AT_NONE) ? data->mAssetInfo.mType : data->mPreferredLocation;
-                if (LLAssetType::AT_SOUND == data->mAssetInfo.mType ||
-                        LLAssetType::AT_TEXTURE == data->mAssetInfo.mType ||
-                        LLAssetType::AT_ANIMATION == data->mAssetInfo.mType)
-                {
-                        // Charge the user for the upload.
-                        LLViewerRegion* region = gAgent.getRegion();
-                        S32 upload_cost = gGlobalEconomy->getPriceUpload();
-                        if(!(can_afford_transaction(upload_cost)))
-                        {
-                                LLFloaterBuyCurrency::buyCurrency(
-                                        llformat("Uploading %s costs",
-                                                data->mAssetInfo.getName().c_str()),
-                                        upload_cost);
-                                is_balance_sufficient = FALSE;
-                        }
-                        else if(region)
-                        {
-                                // Charge user for upload
-                                gStatusBar->debitBalance(upload_cost);
-                                
-                                LLMessageSystem* msg = gMessageSystem;
-                                msg->newMessageFast(_PREHASH_MoneyTransferRequest);
-                                msg->nextBlockFast(_PREHASH_AgentData);
-                                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                                msg->nextBlockFast(_PREHASH_MoneyData);
-                                msg->addUUIDFast(_PREHASH_SourceID, gAgent.getID());
-                                msg->addUUIDFast(_PREHASH_DestID, LLUUID::null);
-                                msg->addU8("Flags", 0);
-                                msg->addS32Fast(_PREHASH_Amount, upload_cost);
-                                msg->addU8Fast(_PREHASH_AggregatePermNextOwner, (U8)LLAggregatePermissions::AP_EMPTY);
-                                msg->addU8Fast(_PREHASH_AggregatePermInventory, (U8)LLAggregatePermissions::AP_EMPTY);
-                                msg->addS32Fast(_PREHASH_TransactionType, TRANS_UPLOAD_CHARGE);
-                                msg->addStringFast(_PREHASH_Description, NULL);
-                                msg->sendReliable(region->getHost());
-                        }
-                }
-                if(is_balance_sufficient)
-                {
-                        // Actually add the upload to inventory
-                        llinfos << "Adding " << uuid << " to inventory." << llendl;
-                        LLUUID folder_id(gInventory.findCategoryUUIDForType(dest_loc));
-                        if(folder_id.notNull())
-                        {
-                                U32 next_owner_perm = data->mNextOwnerPerm;
-                                if(PERM_NONE == next_owner_perm)
-                                {
-                                        next_owner_perm = PERM_MOVE | PERM_TRANSFER;
-                                }
-                                create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
-                                        folder_id, data->mAssetInfo.mTransactionID, data->mAssetInfo.getName(),
-                                        data->mAssetInfo.getDescription(), data->mAssetInfo.mType,
-                                        data->mInventoryType, NOT_WEARABLE, next_owner_perm,
-                                        LLPointer<LLInventoryCallback>(NULL));
-                        }
-                        else
-                        {
-                                llwarns << "Can't find a folder to put it in" << llendl;
-                        }
-                }
-        }
-        else //         if(result >= 0)
-        {
-                LLStringBase<char>::format_map_t args;
-                args["[FILE]"] = LLInventoryType::lookupHumanReadable(data->mInventoryType);
-                args["[REASON]"] = LLString(LLAssetStorage::getErrorString(result));
-                gViewerWindow->alertXml("CannotUploadReason", args);
-        }
-        LLUploadDialog::modalUploadFinished();
-        delete data;
-        // *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 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 );
-                upload_new_resource(next_file, asset_name, asset_name,  // file
-                                                        0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE);
-        }
-}
 LLUUID gExporterRequestID;
 LLString gExportDirectory;
@@ -7634,15 +6726,6 @@ BOOL enable_not_thirdperson(void*)
        return !gAgent.cameraThirdPerson();
 }
-class LLFileEnableUpload : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                bool new_value = gStatusBar && gGlobalEconomy && (gStatusBar->getBalance() >= gGlobalEconomy->getPriceUpload());
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-                return true;
-        }
-};
 BOOL enable_export_selected(void *)
 {
@@ -7857,14 +6940,6 @@ void reload_vertex_shader(void *)
        //THIS WOULD BE AN AWESOME PLACE TO RELOAD SHADERS... just a thought    - DaveP
 }
-void flush_animations(void *)
-{
-        if (gAgent.getAvatarObject())
-        {
-                gAgent.getAvatarObject()->resetAnimations();
-        }
-}
 void slow_mo_animations(void*)
 {
        static BOOL slow_mo = FALSE;
@@ -8450,24 +7525,10 @@ class LLToolsSelectTool : public view_listener_t
        }
 };
-void initialize_menu_actions()
+void initialize_menus()
 {
        // File menu
-        (new LLFileUploadImage())->registerListener(gMenuHolder, "File.UploadImage");
+        init_menu_file();
-        (new LLFileUploadSound())->registerListener(gMenuHolder, "File.UploadSound");
-        (new LLFileUploadAnim())->registerListener(gMenuHolder, "File.UploadAnim");
-        (new LLFileUploadBulk())->registerListener(gMenuHolder, "File.UploadBulk");
-        (new LLFileCloseWindow())->registerListener(gMenuHolder, "File.CloseWindow");
-        (new LLFileEnableCloseWindow())->registerListener(gMenuHolder, "File.EnableCloseWindow");
-        (new LLFileSaveTexture())->registerListener(gMenuHolder, "File.SaveTexture");
-        (new LLFileTakeSnapshot())->registerListener(gMenuHolder, "File.TakeSnapshot");
-        (new LLFileTakeSnapshotToDisk())->registerListener(gMenuHolder, "File.TakeSnapshotToDisk");
-        (new LLFileSaveMovie())->registerListener(gMenuHolder, "File.SaveMovie");
-        (new LLFileSetWindowSize())->registerListener(gMenuHolder, "File.SetWindowSize");
-        (new LLFileQuit())->registerListener(gMenuHolder, "File.Quit");
-        (new LLFileEnableUpload())->registerListener(gMenuHolder, "File.EnableUpload");
-        (new LLFileEnableSaveAs())->registerListener(gMenuHolder, "File.EnableSaveAs");
        // Edit menu
        (new LLEditUndo())->registerListener(gMenuHolder, "Edit.Undo");
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index ac2a57a..c223a3a 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -29,8 +29,6 @@
 #ifndef LL_LLVIEWERMENU_H
 #define LL_LLVIEWERMENU_H
-#include "llassetstorage.h"
-#include "llinventory.h"
 #include "llmenugl.h"
 //newview includes
@@ -41,14 +39,6 @@ class LLView;
 class LLParcelSelection;
 class LLObjectSelection;
-struct LLResourceData
-{
-        LLAssetInfo mAssetInfo;
-        LLAssetType::EType mPreferredLocation;
-        LLInventoryType::EType mInventoryType;
-        U32 mNextOwnerPerm;
-        void *mUserData;
-};
 void pre_init_menus();
 void init_menus();
@@ -114,25 +104,6 @@ bool handle_give_money_dialog();
 bool handle_object_open();
 bool handle_go_to();
-void upload_new_resource(const LLString& src_filename, std::string name,
-                                                 std::string desc, S32 compression_info,
-                                                 LLAssetType::EType destination_folder_type,
-                                                 LLInventoryType::EType inv_type,
-                                                 U32 next_owner_perm = PERM_NONE,
-                                                 const LLString& display_name = LLString::null,
-                                                 LLAssetStorage::LLStoreAssetCallback callback = NULL,
-                                                 void *userdata = NULL);
-void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType type,
-                                                 std::string name,
-                                                 std::string desc, S32 compression_info,
-                                                 LLAssetType::EType destination_folder_type,
-                                                 LLInventoryType::EType inv_type,
-                                                 U32 next_owner_perm = PERM_NONE,
-                                                 const LLString& display_name = LLString::null,
-                                                 LLAssetStorage::LLStoreAssetCallback callback = NULL,
-                                                 void *userdata = NULL);
 // Export to XML or Collada
 void handle_export_selected( void * );
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
new file mode 100644
index 0000000..6954b1c
--- /dev/null
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -0,0 +1,1022 @@
+/** 
+ * @file llviewermenufile.cpp
+ * @brief "File" menu in the main menu bar.
+ *
+ * Copyright (c) 2002-2007, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+ */
+#include "llviewerprecompiledheaders.h"
+#include "llviewermenufile.h"
+// project includes
+#include "llagent.h"
+#include "llfilepicker.h"
+#include "llfloateranimpreview.h"
+#include "llfloaterbuycurrency.h"
+#include "llfloaterimagepreview.h"
+#include "llfloaterimport.h"
+#include "llfloaternamedesc.h"
+#include "llfloatersnapshot.h"
+#include "llinventorymodel.h"   // gInventory
+#include "llresourcedata.h"
+#include "llstatusbar.h"
+#include "llviewercontrol.h"    // gSavedSettings
+#include "llviewerimagelist.h"
+#include "llvieweruictrlfactory.h"
+#include "llviewermenu.h"       // gMenuHolder
+#include "llviewerregion.h"
+#include "llviewerstats.h"
+#include "llviewerwindow.h"
+#include "viewer.h"     // app_request_quit()
+// linden libraries
+#include "llassetuploadresponders.h"
+#include "lleconomy.h"
+#include "llhttpclient.h"
+#include "llmemberlistener.h"
+#include "llsdserialize.h"
+#include "llstring.h"
+#include "lltransactiontypes.h"
+#include "lluuid.h"
+#include "vorbisencode.h"
+// system libraries
+#include <boost/tokenizer.hpp>
+typedef LLMemberListener<LLView> view_listener_t;
+class LLFileEnableSaveAs : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gFloaterView->getFrontmost() && gFloaterView->getFrontmost()->canSaveAs();
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
+class LLFileEnableUpload : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gStatusBar && gGlobalEconomy && (gStatusBar->getBalance() >= gGlobalEconomy->getPriceUpload());
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
+/**
+   char* upload_pick(void* data)
+   If applicable, brings up a file chooser in which the user selects a file
+   to upload for a particular task.  If the file is valid for the given action,
+   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)
+{
+        if( gAgent.cameraMouselook() )
+        {
+                gAgent.changeCameraToDefault();
+                // This doesn't seem necessary. JC
+                // display();
+        }
+        LLFilePicker::ELoadFilter type;
+        if(data)
+        {
+                type = (LLFilePicker::ELoadFilter)((intptr_t)data);
+        }
+        else
+        {
+                type = LLFilePicker::FFLOAD_ALL;
+        }
+        LLFilePicker& picker = LLFilePicker::instance();
+        if (!picker.getOpenFile(type))
+        {
+                llinfos << "Couldn't import objects from file" << llendl;
+                return NULL;
+        }
+        const char* filename = picker.getFirstFile();
+        const char* ext = strrchr(filename, '.');
+        //strincmp doesn't like NULL pointers
+        if (ext == NULL)
+        {
+                const char* short_name = strrchr(filename,
+                                                                                 *gDirUtilp->getDirDelimiter().c_str());
+                
+                // No extension
+                LLStringBase<char>::format_map_t args;
+                args["[FILE]"] = LLString(short_name + 1);
+                gViewerWindow->alertXml("NoFileExtension", args);
+                return NULL;
+        }
+        else
+        {
+                //so there is an extension
+                //loop over the valid extensions and compare to see
+                //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);
+                BOOL ext_valid = FALSE;
+                
+                typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+                boost::char_separator<char> sep(" ");
+                tokenizer tokens(valid_extensions, sep);
+                tokenizer::iterator token_iter;
+                //now loop over all valid file extensions
+                //and compare them to the extension of the file
+                //to be uploaded
+                for( token_iter = tokens.begin();
+                         token_iter != tokens.end() && ext_valid != TRUE;
+                         ++token_iter)
+                {
+                        const char* cur_token = token_iter->c_str();
+                        if (0 == strnicmp(cur_token, ext, strlen(cur_token)) ||         /* Flawfinder: ignore */
+                                0 == strnicmp(cur_token, "*.*", strlen(cur_token)))             /* Flawfinder: ignore */
+                        {
+                                //valid extension
+                                //or the acceptable extension is any
+                                ext_valid = TRUE;
+                        }
+                }//end for (loop over all tokens)
+                if (ext_valid == FALSE)
+                {
+                        //should only get here if the extension exists
+                        //but is invalid
+                        LLStringBase<char>::format_map_t args;
+                        args["[EXTENSION]"] = ext;
+                        args["[VALIDS]"] = valids;
+                        gViewerWindow->alertXml("InvalidFileExtension", args);
+                        return NULL;
+                }
+        }//end else (non-null extension)
+        //valid file extension
+        
+        //now we check to see
+        //if the file is actually a valid image/sound/etc.
+        if (type == LLFilePicker::FFLOAD_WAV)
+        {
+                // pre-qualify wavs to make sure the format is acceptable
+                char error_msg[MAX_STRING];             /* Flawfinder: ignore */        
+                if (check_for_invalid_wav_formats(filename,error_msg))
+                {
+                        llinfos << error_msg << ": " << filename << llendl;
+                        LLStringBase<char>::format_map_t args;
+                        args["[FILE]"] = filename;
+                        gViewerWindow->alertXml( error_msg, args );
+                        return NULL;
+                }
+        }//end if a wave/sound file
+        
+        return filename;
+}
+void handle_upload_object(void* data)
+{
+        const char* filename = upload_pick(data);
+        if (filename)
+        {
+                // start the import
+                LLFloaterImport* floaterp = new LLFloaterImport(filename);
+                gUICtrlFactory->buildFloater(floaterp, "floater_import.xml");
+        }
+}
+class LLFileUploadImage : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                const char* filename = upload_pick((void *)(S32)LLFilePicker::FFLOAD_IMAGE);
+                if (filename)
+                {
+                        LLFloaterImagePreview* floaterp = new LLFloaterImagePreview(filename);
+                        gUICtrlFactory->buildFloater(floaterp, "floater_image_preview.xml");
+                }
+                return TRUE;
+        }
+};
+class LLFileUploadSound : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                const char* filename = upload_pick((void*)((S32)LLFilePicker::FFLOAD_WAV));
+                if (filename)
+                {
+                        LLFloaterNameDesc* floaterp = new LLFloaterNameDesc(filename);
+                        gUICtrlFactory->buildFloater(floaterp, "floater_sound_preview.xml");
+                }
+                return true;
+        }
+};
+class LLFileUploadAnim : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                const char* filename = upload_pick((void*)((S32)LLFilePicker::FFLOAD_ANIM));
+                if (filename)
+                {
+                        LLFloaterAnimPreview* floaterp = new LLFloaterAnimPreview(filename);
+                        gUICtrlFactory->buildFloater(floaterp, "floater_animation_preview.xml");
+                }
+                return true;
+        }
+};
+class LLFileUploadBulk : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                if( gAgent.cameraMouselook() )
+                {
+                        gAgent.changeCameraToDefault();
+                }
+                // TODO:
+                // Iterate over all files
+                // Check extensions for uploadability, cost
+                // Check user balance for entire cost
+                // Charge user entire cost
+                // Loop, uploading
+                // If an upload fails, refund the user for that one
+                //
+                // Also fix single upload to charge first, then refund
+                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 );
+                        upload_new_resource(filename, asset_name, asset_name, 0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE); // file
+                }
+                else
+                {
+                        llinfos << "Couldn't import objects from file" << llendl;
+                }
+                return true;
+        }
+};
+void upload_error(const char* error_message, const char* label, const std::string filename, const LLStringBase<char>::format_map_t args) 
+{
+        llwarns << error_message << llendl;
+        gViewerWindow->alertXml(label, args);
+        if(remove(filename.c_str()) == -1)
+        {
+                lldebugs << "unable to remove temp file" << llendl;
+        }
+        LLFilePicker::instance().reset();                                               
+}
+class LLFileEnableCloseWindow : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gFloaterView->getFocusedFloater() != NULL || gSnapshotFloaterView->getFocusedFloater() != NULL;
+                // horrendously opaque, this code
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
+class LLFileCloseWindow : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLFloater::closeFocusedFloater();
+                return true;
+        }
+};
+class LLFileCloseAllWindows : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool app_quitting = false;
+                gFloaterView->closeAllChildren(app_quitting);
+                return true;
+        }
+};
+class LLFileSaveTexture : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLFloater* top = gFloaterView->getFrontmost();
+                if (top)
+                {
+                        top->saveAs();
+                }
+                return true;
+        }
+};
+class LLFileTakeSnapshot : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLFloaterSnapshot::show(NULL);
+                return true;
+        }
+};
+class LLFileTakeSnapshotToDisk : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLPointer<LLImageRaw> raw = new LLImageRaw;
+                S32 width = gViewerWindow->getWindowDisplayWidth();
+                S32 height = gViewerWindow->getWindowDisplayHeight();
+                if (gSavedSettings.getBOOL("HighResSnapshot"))
+                {
+                        width *= 2;
+                        height *= 2;
+                }
+                if (gViewerWindow->rawSnapshot(raw,
+                                                                           width,
+                                                                           height,
+                                                                           TRUE,
+                                                                           gSavedSettings.getBOOL("RenderUIInSnapshot"),
+                                                                           FALSE))
+                {
+                        if (!gQuietSnapshot)
+                        {
+                                gViewerWindow->playSnapshotAnimAndSound();
+                        }
+                        LLImageBase::setSizeOverride(TRUE);
+                        gViewerWindow->saveImageNumbered(raw);
+                        LLImageBase::setSizeOverride(FALSE);
+                }
+                return true;
+        }
+};
+class LLFileSaveMovie : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLViewerWindow::saveMovieNumbered(NULL);
+                return true;
+        }
+};
+class LLFileSetWindowSize : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLString size = userdata.asString();
+                S32 width, height;
+                sscanf(size.c_str(), "%d,%d", &width, &height);
+                LLViewerWindow::movieSize(width, height);
+                return true;
+        }
+};
+class LLFileQuit : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                app_request_quit();
+                return true;
+        }
+};
+void handle_upload(void* data)
+{
+        const char* filename = upload_pick(data);
+        if (filename)
+        {
+                LLFloaterNameDesc* floaterp = new LLFloaterNameDesc(filename);
+                gUICtrlFactory->buildFloater(floaterp, "floater_name_description.xml");
+        }
+}
+void handle_compress_image(void*)
+{
+        LLFilePicker& picker = LLFilePicker::instance();
+        if (picker.getOpenFile(LLFilePicker::FFLOAD_IMAGE))
+        {
+                std::string infile(picker.getFirstFile());
+                std::string outfile = infile + ".j2c";
+                llinfos << "Input:  " << infile << llendl;
+                llinfos << "Output: " << outfile << llendl;
+                BOOL success;
+                success = LLViewerImageList::createUploadFile(infile, outfile, IMG_CODEC_TGA);
+                if (success)
+                {
+                        llinfos << "Compression complete" << llendl;
+                }
+                else
+                {
+                        llinfos << "Compression failed: " << LLImageBase::getLastError() << llendl;
+                }
+        }
+}
+void upload_new_resource(const LLString& 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,
+                                                 LLAssetStorage::LLStoreAssetCallback callback,
+                                                 void *userdata)
+{       
+        // Generate the temporary UUID.
+        LLString filename = gDirUtilp->getTempFilename();
+        LLTransactionID tid;
+        LLAssetID uuid;
+        
+        LLStringBase<char>::format_map_t args;
+        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;
+        BOOL error = FALSE;
+        
+        if (ext.empty())
+        {
+                LLString::size_type offset = filename.find_last_of(gDirUtilp->getDirDelimiter());
+                if (offset != LLString::npos)
+                        offset++;
+                LLString short_name = filename.substr(offset);
+                
+                // No extension
+                snprintf(error_message,         /* Flawfinder: ignore */
+                                MAX_STRING,
+                                "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 )
+        {
+                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 */
+                                        src_filename.c_str(), LLImageBase::getLastError().c_str());
+                        args["[FILE]"] = src_filename;
+                        args["[ERROR]"] = LLImageBase::getLastError();
+                        upload_error(error_message, "ProblemWithFile", filename, args);
+                        return;
+                }
+        }
+        else if( LLString::compareInsensitive(ext.c_str(),".tga") == 0 )
+        {
+                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 */
+                                        src_filename.c_str(), LLImageBase::getLastError().c_str());
+                        args["[FILE]"] = src_filename;
+                        args["[ERROR]"] = LLImageBase::getLastError();
+                        upload_error(error_message, "ProblemWithFile", filename, args);
+                        return;
+                }
+        }
+        else if( LLString::compareInsensitive(ext.c_str(),".jpg") == 0 || LLString::compareInsensitive(ext.c_str(),".jpeg") == 0)
+        {
+                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 */
+                                        src_filename.c_str(), LLImageBase::getLastError().c_str());
+                        args["[FILE]"] = src_filename;
+                        args["[ERROR]"] = LLImageBase::getLastError();
+                        upload_error(error_message, "ProblemWithFile", filename, args);
+                        return;
+                }
+        }
+        else if(LLString::compareInsensitive(ext.c_str(),".wav") == 0)
+        {
+                asset_type = LLAssetType::AT_SOUND;  // tag it as audio
+                S32 encode_result = 0;
+                S32 bitrate = 128;
+                if (compression_info)
+                {
+                        bitrate = compression_info;
+                }
+                llinfos << "Attempting to encode wav as an ogg file at " << bitrate << "kbps" << llendl;
+                encode_result = encode_vorbis_file_at(src_filename.c_str(), filename.c_str(), bitrate*1000);
+                
+                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 */
+                                        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 */
+                                        args["[FILE]"] = src_filename;
+                                        upload_error(error_message, "UnknownVorbisEncodeFailure", filename, args);
+                                        break;  
+                        }       
+                        return;
+                }
+        }
+        else if(LLString::compareInsensitive(ext.c_str(),".tmp") == 0)          
+        {               
+                // This is a generic .lin resource file         
+         asset_type = LLAssetType::AT_OBJECT;           
+         FILE* in = LLFile::fopen(src_filename.c_str(), "rb");          /* Flawfinder: ignore */                
+         if (in)                
+         {              
+                 // read in the file header             
+                 char buf[16384];               /* Flawfinder: ignore */        
+                 S32 read;              /* Flawfinder: ignore */                
+                 S32  version;          
+                 if (fscanf(in, "LindenResource\nversion %d\n", &version))              
+                 {              
+                         if (2 == version)              
+                         {
+                                                                // *NOTE: This buffer size is hard coded into scanf() below.
+                                 char label[MAX_STRING];                /* Flawfinder: ignore */                
+                                 char value[MAX_STRING];                /* Flawfinder: ignore */                
+                                 S32  tokens_read;              
+                                 while (fgets(buf, 1024, in))           
+                                 {              
+                                         label[0] = '\0';               
+                                         value[0] = '\0';               
+                                         tokens_read = sscanf(  /* Flawfinder: ignore */
+                                                                                         buf,
+                                                                                         "%254s %254s\n",
+                                                                                         label, value);         
+                                         llinfos << "got: " << label << " = " << value          
+                                                         << llendl;             
+                                         if (EOF == tokens_read)                
+                                         {              
+                                                 fclose(in);            
+                                                 snprintf(error_message, MAX_STRING, "corrupt resource file: %s", src_filename.c_str());                /* Flawfinder: ignore */
+                                                                                                 args["[FILE]"] = src_filename;
+                                                                                                 upload_error(error_message, "CorruptResourceFile", filename, args);
+                                                 return;
+                                         }              
+                                         if (2 == tokens_read)          
+                                         {              
+                                                 if (! strcmp("type", label))           
+                                                 {              
+                                                         asset_type = (LLAssetType::EType)(atoi(value));                
+                                                 }              
+                                         }              
+                                         else           
+                                         {              
+                                                 if (! strcmp("_DATA_", label))         
+                                                 {              
+                                                         // below is the data section           
+                                                         break;         
+                                                 }              
+                                         }              
+                                         // other values are currently discarded                
+                                 }              
+                         }              
+                         else           
+                         {              
+                                 fclose(in);            
+                                 snprintf(error_message, MAX_STRING, "unknown linden resource file version in file: %s", src_filename.c_str());         /* Flawfinder: ignore */
+                                                                 args["[FILE]"] = src_filename;
+                                                                 upload_error(error_message, "UnknownResourceFileVersion", filename, args);
+                                 return;
+                         }              
+                 }              
+                 else           
+                 {              
+                         // this is an original binary formatted .lin file              
+                         // start over at the beginning of the file             
+                         fseek(in, 0, SEEK_SET);                
+                         const S32 MAX_ASSET_DESCRIPTION_LENGTH = 256;          
+                         const S32 MAX_ASSET_NAME_LENGTH = 64;          
+                         S32 header_size = 34 + MAX_ASSET_DESCRIPTION_LENGTH + MAX_ASSET_NAME_LENGTH;           
+                         S16     type_num;              
+                         // read in and throw out most of the header except for the type                
+                         fread(buf, header_size, 1, in);                
+                         memcpy(&type_num, buf + 16, sizeof(S16));              /* Flawfinder: ignore */                
+                         asset_type = (LLAssetType::EType)type_num;             
+                 }              
+                 // copy the file's data segment into another file for uploading                
+                 FILE* out = LLFile::fopen(filename.c_str(), "wb");             /* Flawfinder: ignore */        
+                 if (out)               
+                 {              
+                         while((read = fread(buf, 1, 16384, in)))               /* Flawfinder: ignore */                
+                         {              
+                                 fwrite(buf, 1, read, out);             /* Flawfinder: ignore */                                
+                         }              
+                         fclose(out);           
+                 }              
+                 else           
+                 {              
+                         fclose(in);            
+                         snprintf(error_message, MAX_STRING, "Unable to create output file: %s", filename.c_str());             /* Flawfinder: ignore */
+                                                 args["[FILE]"] = filename;
+                                                 upload_error(error_message, "UnableToCreateOutputFile", filename, args);
+                         return;
+                 }              
+                 fclose(in);            
+         }              
+         else           
+         {              
+                 llinfos << "Couldn't open .lin file " << src_filename << llendl;               
+         }              
+        }
+        else if (LLString::compareInsensitive(ext.c_str(),".bvh") == 0)
+        {
+                snprintf(error_message, MAX_STRING, "We do not currently support bulk upload of animation files\n");            /* Flawfinder: ignore */
+                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 */
+                error = TRUE;;
+        }
+        // gen a new transaction ID for this asset
+        tid.generate();
+        if (!error)
+        {
+                uuid = tid.makeAssetID(gAgent.getSecureSessionID());
+                // copy this file into the vfs for upload
+                S32 file_size;
+                apr_file_t* fp = ll_apr_file_open(filename, LL_APR_RB, &file_size);
+                if (fp)
+                {
+                        LLVFile file(gVFS, uuid, asset_type, LLVFile::WRITE);
+                        file.setMaxSize(file_size);
+                        const S32 buf_size = 65536;
+                        U8 copy_buf[buf_size];
+                        while ((file_size = ll_apr_file_read(fp, copy_buf, buf_size)))
+                        {
+                                file.write(copy_buf, file_size);
+                        }
+                        apr_file_close(fp);
+                }
+                else
+                {
+                        snprintf(error_message, MAX_STRING, "Unable to access output file: %s", filename.c_str());              /* Flawfinder: ignore */
+                        error = TRUE;
+                }
+        }
+        if (!error)
+        {
+                LLString t_disp_name = display_name;
+                if (t_disp_name.empty())
+                {
+                        t_disp_name = src_filename;
+                }
+                upload_new_resource(tid, asset_type, name, desc, compression_info, // tid
+                                                        destination_folder_type, inv_type, next_owner_perm,
+                                                        display_name, callback, userdata);
+        }
+        else
+        {
+                llwarns << error_message << llendl;
+                LLStringBase<char>::format_map_t args;
+                args["[ERROR_MESSAGE]"] = error_message;
+                gViewerWindow->alertXml("ErrorMessage", args);
+                if(LLFile::remove(filename.c_str()) == -1)
+                {
+                        lldebugs << "unable to remove temp file" << llendl;
+                }
+                LLFilePicker::instance().reset();
+        }
+}
+void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result) // StoreAssetData callback (fixed)
+{
+        LLResourceData* data = (LLResourceData*)user_data;
+        //LLAssetType::EType pref_loc = data->mPreferredLocation;
+        BOOL is_balance_sufficient = TRUE;
+        if(result >= 0)
+        {
+                LLAssetType::EType dest_loc = (data->mPreferredLocation == LLAssetType::AT_NONE) ? data->mAssetInfo.mType : data->mPreferredLocation;
+                if (LLAssetType::AT_SOUND == data->mAssetInfo.mType ||
+                        LLAssetType::AT_TEXTURE == data->mAssetInfo.mType ||
+                        LLAssetType::AT_ANIMATION == data->mAssetInfo.mType)
+                {
+                        // Charge the user for the upload.
+                        LLViewerRegion* region = gAgent.getRegion();
+                        S32 upload_cost = gGlobalEconomy->getPriceUpload();
+                        if(!(can_afford_transaction(upload_cost)))
+                        {
+                                LLFloaterBuyCurrency::buyCurrency(
+                                        llformat("Uploading %s costs",
+                                                data->mAssetInfo.getName().c_str()),
+                                        upload_cost);
+                                is_balance_sufficient = FALSE;
+                        }
+                        else if(region)
+                        {
+                                // Charge user for upload
+                                gStatusBar->debitBalance(upload_cost);
+                                
+                                LLMessageSystem* msg = gMessageSystem;
+                                msg->newMessageFast(_PREHASH_MoneyTransferRequest);
+                                msg->nextBlockFast(_PREHASH_AgentData);
+                                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                                msg->nextBlockFast(_PREHASH_MoneyData);
+                                msg->addUUIDFast(_PREHASH_SourceID, gAgent.getID());
+                                msg->addUUIDFast(_PREHASH_DestID, LLUUID::null);
+                                msg->addU8("Flags", 0);
+                                msg->addS32Fast(_PREHASH_Amount, upload_cost);
+                                msg->addU8Fast(_PREHASH_AggregatePermNextOwner, (U8)LLAggregatePermissions::AP_EMPTY);
+                                msg->addU8Fast(_PREHASH_AggregatePermInventory, (U8)LLAggregatePermissions::AP_EMPTY);
+                                msg->addS32Fast(_PREHASH_TransactionType, TRANS_UPLOAD_CHARGE);
+                                msg->addStringFast(_PREHASH_Description, NULL);
+                                msg->sendReliable(region->getHost());
+                        }
+                }
+                if(is_balance_sufficient)
+                {
+                        // Actually add the upload to inventory
+                        llinfos << "Adding " << uuid << " to inventory." << llendl;
+                        LLUUID folder_id(gInventory.findCategoryUUIDForType(dest_loc));
+                        if(folder_id.notNull())
+                        {
+                                U32 next_owner_perm = data->mNextOwnerPerm;
+                                if(PERM_NONE == next_owner_perm)
+                                {
+                                        next_owner_perm = PERM_MOVE | PERM_TRANSFER;
+                                }
+                                create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
+                                        folder_id, data->mAssetInfo.mTransactionID, data->mAssetInfo.getName(),
+                                        data->mAssetInfo.getDescription(), data->mAssetInfo.mType,
+                                        data->mInventoryType, NOT_WEARABLE, next_owner_perm,
+                                        LLPointer<LLInventoryCallback>(NULL));
+                        }
+                        else
+                        {
+                                llwarns << "Can't find a folder to put it in" << llendl;
+                        }
+                }
+        }
+        else //         if(result >= 0)
+        {
+                LLStringBase<char>::format_map_t args;
+                args["[FILE]"] = LLInventoryType::lookupHumanReadable(data->mInventoryType);
+                args["[REASON]"] = LLString(LLAssetStorage::getErrorString(result));
+                gViewerWindow->alertXml("CannotUploadReason", args);
+        }
+        LLUploadDialog::modalUploadFinished();
+        delete data;
+        // *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 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 );
+                upload_new_resource(next_file, asset_name, asset_name,  // file
+                                                        0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE);
+        }
+}
+void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_type,
+                                                 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,
+                                                 LLAssetStorage::LLStoreAssetCallback callback,
+                                                 void *userdata)
+{
+        LLAssetID uuid = tid.makeAssetID(gAgent.getSecureSessionID());
+        
+        if( LLAssetType::AT_SOUND == asset_type )
+        {
+                gViewerStats->incStat(LLViewerStats::ST_UPLOAD_SOUND_COUNT );
+        }
+        else
+        if( LLAssetType::AT_TEXTURE == asset_type )
+        {
+                gViewerStats->incStat(LLViewerStats::ST_UPLOAD_TEXTURE_COUNT );
+        }
+        else
+        if( LLAssetType::AT_ANIMATION == asset_type)
+        {
+                gViewerStats->incStat(LLViewerStats::ST_UPLOAD_ANIM_COUNT );
+        }
+        if(LLInventoryType::IT_NONE == inv_type)
+        {
+                inv_type = LLInventoryType::defaultForAssetType(asset_type);
+        }
+        LLString::stripNonprintable(name);
+        LLString::stripNonprintable(desc);
+        if(name.empty())
+        {
+                name = "(No Name)";
+        }
+        if(desc.empty())
+        {
+                desc = "(No Description)";
+        }
+        
+        // At this point, we're ready for the upload.
+        LLString upload_message = "Uploading...\n\n";
+        upload_message.append(display_name);
+        LLUploadDialog::modalUploadDialog(upload_message);
+        llinfos << "*** Uploading: " << llendl;
+        llinfos << "Type: " << LLAssetType::lookup(asset_type) << llendl;
+        llinfos << "UUID: " << uuid << llendl;
+        llinfos << "Name: " << name << llendl;
+        llinfos << "Desc: " << desc << llendl;
+        lldebugs << "Folder: " << gInventory.findCategoryUUIDForType((destination_folder_type == LLAssetType::AT_NONE) ? asset_type : destination_folder_type) << llendl;
+        lldebugs << "Asset Type: " << LLAssetType::lookup(asset_type) << llendl;
+        std::string url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
+        if (!url.empty())
+        {
+                llinfos << "New Agent Inventory via capability" << llendl;
+                LLSD body;
+                body["folder_id"] = gInventory.findCategoryUUIDForType((destination_folder_type == LLAssetType::AT_NONE) ? asset_type : destination_folder_type);
+                body["asset_type"] = LLAssetType::lookup(asset_type);
+                body["inventory_type"] = LLInventoryType::lookup(inv_type);
+                body["name"] = name;
+                body["description"] = desc;
+                
+                std::ostringstream llsdxml;
+                LLSDSerialize::toXML(body, llsdxml);
+                lldebugs << "posting body to capability: " << llsdxml.str() << llendl;
+                LLHTTPClient::post(url, body, new LLNewAgentInventoryResponder(body, uuid, asset_type));
+        }
+        else
+        {
+                llinfos << "NewAgentInventory capability not found, new agent inventory via asset system." << llendl;
+                // check for adequate funds
+                // TODO: do this check on the sim
+                if (LLAssetType::AT_SOUND == asset_type ||
+                        LLAssetType::AT_TEXTURE == asset_type ||
+                        LLAssetType::AT_ANIMATION == asset_type)
+                {
+                        S32 upload_cost = gGlobalEconomy->getPriceUpload();
+                        S32 balance = gStatusBar->getBalance();
+                        if (balance < upload_cost)
+                        {
+                                // insufficient funds, bail on this upload
+                                LLFloaterBuyCurrency::buyCurrency("Uploading costs", upload_cost);
+                                return;
+                        }
+                }
+                LLResourceData* data = new LLResourceData;
+                data->mAssetInfo.mTransactionID = tid;
+                data->mAssetInfo.mUuid = uuid;
+                data->mAssetInfo.mType = asset_type;
+                data->mAssetInfo.mCreatorID = gAgentID;
+                data->mInventoryType = inv_type;
+                data->mNextOwnerPerm = next_owner_perm;
+                data->mUserData = userdata;
+                data->mAssetInfo.setName(name);
+                data->mAssetInfo.setDescription(desc);
+                data->mPreferredLocation = destination_folder_type;
+                LLAssetStorage::LLStoreAssetCallback asset_callback = &upload_done_callback;
+                if (callback)
+                {
+                        asset_callback = callback;
+                }
+                gAssetStorage->storeAssetData(data->mAssetInfo.mTransactionID, data->mAssetInfo.mType,
+                                                                                asset_callback,
+                                                                                (void*)data,
+                                                                                FALSE);
+        }
+}
+void init_menu_file()
+{
+        (new LLFileUploadImage())->registerListener(gMenuHolder, "File.UploadImage");
+        (new LLFileUploadSound())->registerListener(gMenuHolder, "File.UploadSound");
+        (new LLFileUploadAnim())->registerListener(gMenuHolder, "File.UploadAnim");
+        (new LLFileUploadBulk())->registerListener(gMenuHolder, "File.UploadBulk");
+        (new LLFileCloseWindow())->registerListener(gMenuHolder, "File.CloseWindow");
+        (new LLFileCloseAllWindows())->registerListener(gMenuHolder, "File.CloseAllWindows");
+        (new LLFileEnableCloseWindow())->registerListener(gMenuHolder, "File.EnableCloseWindow");
+        (new LLFileSaveTexture())->registerListener(gMenuHolder, "File.SaveTexture");
+        (new LLFileTakeSnapshot())->registerListener(gMenuHolder, "File.TakeSnapshot");
+        (new LLFileTakeSnapshotToDisk())->registerListener(gMenuHolder, "File.TakeSnapshotToDisk");
+        (new LLFileSaveMovie())->registerListener(gMenuHolder, "File.SaveMovie");
+        (new LLFileSetWindowSize())->registerListener(gMenuHolder, "File.SetWindowSize");
+        (new LLFileQuit())->registerListener(gMenuHolder, "File.Quit");
+        (new LLFileEnableUpload())->registerListener(gMenuHolder, "File.EnableUpload");
+        (new LLFileEnableSaveAs())->registerListener(gMenuHolder, "File.EnableSaveAs");
+}
diff --git a/linden/indra/newview/llviewermenufile.h b/linden/indra/newview/llviewermenufile.h
new file mode 100644
index 0000000..32806fb
--- /dev/null
+++ b/linden/indra/newview/llviewermenufile.h
@@ -0,0 +1,59 @@
+/** 
+ * @file llviewermenufile.h
+ * @brief "File" menu in the main menu bar.
+ *
+ * Copyright (c) 2002-2007, 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://secondlife.com/developers/opensource/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://secondlife.com/developers/opensource/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.
+ */
+#ifndef LLVIEWERMENUFILE_H
+#define LLVIEWERMENUFILE_H
+#include "llassettype.h"
+#include "llinventorytype.h"
+class LLTransactionID;
+void init_menu_file();
+void upload_new_resource(const LLString& 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,
+                                                 LLAssetStorage::LLStoreAssetCallback callback = NULL,
+                                                 void *userdata = NULL);
+void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType type,
+                                                 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,
+                                                 LLAssetStorage::LLStoreAssetCallback callback = NULL,
+                                                 void *userdata = NULL);
+#endif
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 5dab363..5eafd9d 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -145,8 +145,14 @@ extern BOOL gDebugClicks;
 extern void bad_network_handler();
 // function prototypes
-void open_offer(const std::vector<LLUUID>& items);
+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);
+//inventory offer throttle globals
+LLFrameTimer gThrottleTimer;
+const U32 OFFER_THROTTLE_MAX_COUNT=5; //number of items per time period
+const F32 OFFER_THROTTLE_TIME=10.f; //time period in seconds
 struct LLFriendshipOffer
 {
@@ -195,11 +201,6 @@ void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_
        }
 }
-BOOL can_afford_transaction(S32 cost)
-{
-        return((cost <= 0)||((gStatusBar) && (gStatusBar->getBalance() >=cost)));
-}
 void send_complete_agent_movement(const LLHost& sim_host)
 {
        LLMessageSystem* msg = gMessageSystem;
@@ -275,11 +276,19 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
        mesgsys->getS8Fast(_PREHASH_LayerID, _PREHASH_Type, type);
        size = mesgsys->getSizeFast(_PREHASH_LayerData, _PREHASH_Data);
-        if(!size)
+        if (0 == size)
        {
                llwarns << "Layer data has zero size." << llendl;
                return;
        }
+        if (size < 0)
+        {
+                // getSizeFast() is probably trying to tell us about an error
+                llwarns << "getSizeFast() returned negative result: "
+                        << size
+                        << llendl;
+                return;
+        }
        U8 *datap = new U8[size];
        mesgsys->getBinaryDataFast(_PREHASH_LayerData, _PREHASH_Data, datap, size);
        LLVLData *vl_datap = new LLVLData(regionp, type, datap, size);
@@ -326,25 +335,29 @@ void export_complete()
                while ((pos = strstr(pos+1, "<sl:image ")) != 0)
                {
                        char *pos_check = strstr(pos, "checksum=\"");
-                        char *pos_uuid = strstr(pos_check, "\">");
-                        if (pos_check && pos_uuid)
+                        if (pos_check)
                        {
-                                char image_uuid_str[UUID_STR_SIZE];             /* Flawfinder: ignore */
+                                char *pos_uuid = strstr(pos_check, "\">");
-                                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);
+                                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);
-                                llinfos << "Found UUID: " << image_uuid << llendl;
+                                        llinfos << "Found UUID: " << image_uuid << llendl;
-                                std::map<LLUUID, LLString>::iterator itor = gImageChecksums.find(image_uuid);
+                                        std::map<LLUUID, LLString>::iterator itor = gImageChecksums.find(image_uuid);
-                                if (itor != gImageChecksums.end())
+                                        if (itor != gImageChecksums.end())
-                                {
-                                        llinfos << "Replacing with checksum: " << itor->second << llendl;
-                                        if (itor->second.c_str() != NULL)
                                        {
-                                                memcpy(&pos_check[10], itor->second.c_str(), 32);               /* Flawfinder: ignore */
+                                                llinfos << "Replacing with checksum: " << itor->second << llendl;
+                                                if (itor->second.c_str() != NULL)
+                                                        {
+                                                                memcpy(&pos_check[10], itor->second.c_str(), 32);               /* Flawfinder: ignore */
+                                                        }
                                        }
                                }
                        }
@@ -354,7 +367,7 @@ void export_complete()
                fwrite(buffer, 1, length, fXMLOut);
                fclose(fXMLOut);
-                delete buffer;
+                delete [] buffer;
 }
@@ -432,7 +445,7 @@ void exported_j2c_complete(const LLTSCode status, void *user_data)
                        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;
+                        delete [] file_path;
                        //S32 name_len = output_file.length();
                        //strcpy(&output_file[name_len-3], "tga");
                        FILE* fOut = LLFile::fopen(output_file.c_str(), "wb");          /* Flawfinder: ignore */
@@ -599,31 +612,44 @@ void join_group_callback(S32 option, void* user_data)
 class LLOpenAgentOffer : public LLInventoryFetchObserver
 {
 public:
-        LLOpenAgentOffer() {}
+        LLOpenAgentOffer(const std::string& from_name) : mFromName(from_name) {}
-        virtual ~LLOpenAgentOffer() {}
+        /*virtual*/ void done()
-        virtual void done()
        {
-                open_offer(mComplete);
+                open_offer(mComplete, mFromName);
                gInventory.removeObserver(this);
                delete this;
        }
+private:
+        std::string mFromName;
 };
-class LLOpenTaskOffer : public LLInventoryExistenceObserver
+//unlike the FetchObserver for AgentOffer, we only make one 
+//instance of the AddedObserver for TaskOffers
+//and it never dies.  We do this because we don't know the UUID of 
+//task offers until they are accepted, so we don't wouldn't 
+//know what to watch for, so instead we just watch for all additions. -Gigs
+class LLOpenTaskOffer : public LLInventoryAddedObserver
 {
-public:
-        LLOpenTaskOffer() {}
-        virtual ~LLOpenTaskOffer() {}
 protected:
-        virtual void done()
+        /*virtual*/ void done()
        {
-                open_offer(mExist);
+                open_offer(mAdded, "");
-                gInventory.removeObserver(this);
+                mAdded.clear();
-                delete this;
        }
-};
+ };
+//one global instance to bind them
+LLOpenTaskOffer* gNewInventoryObserver=NULL;
+void start_new_inventory_observer()
+{
+        if (!gNewInventoryObserver) //task offer observer 
+        {
+                // Observer is deleted by gInventory
+                gNewInventoryObserver = new LLOpenTaskOffer;
+                gInventory.addObserver(gNewInventoryObserver);
+        }
+}
 class LLDiscardAgentOffer : public LLInventoryFetchComboObserver
 {
@@ -675,7 +701,71 @@ protected:
 };
-void open_offer(const std::vector<LLUUID>& items)
+//Returns TRUE if we are OK, FALSE if we are throttled
+//Set check_only true if you want to know the throttle status 
+//without registering a hit -Gigs
+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;
+        if (!gSavedSettings.getBOOL("ShowNewInventory"))
+                return false;
+        if (check_only)
+        {
+                return gThrottleTimer.hasExpired();
+        }
+        
+        if(gThrottleTimer.checkExpirationAndReset(OFFER_THROTTLE_TIME))
+        {
+                //llinfos << "Throttle Expired" << llendl;
+                throttle_count=1;
+                throttle_logged=false;
+                return true;
+        }
+        else //has not expired
+        {
+                //llinfos << "Throttle Not Expired, Count: " << throttle_count << llendl;
+                // When downloading the initial inventory we get a lot of new items
+                // coming in and can't tell that from spam.  JC
+                if (gStartupState >= STATE_STARTED
+                        && throttle_count >= OFFER_THROTTLE_MAX_COUNT)
+                {
+                        if (!throttle_logged)
+                        {
+                                // Use the name of the last item giver, who is probably the person
+                                // spamming you. JC
+                                std::ostringstream message;
+                                message << gSecondLife;
+                                if (!from_name.empty())
+                                {
+                                        message << ": Items coming in too fast from " << from_name;
+                                }
+                                else
+                                {
+                                        message << ": Items coming in too fast";
+                                }
+                                message << ", automatic preview disabled for "
+                                        << OFFER_THROTTLE_TIME << " seconds.";
+                                chat.mText = message.str();
+                                //this is kinda important, so actually put it on screen
+                                LLFloaterChat::addChat(chat, FALSE, FALSE);
+                                throttle_logged=true;
+                        }
+                        return false;
+                }
+                else
+                {
+                        throttle_count++;
+                        return true;
+                }
+        }
+}
+ 
+void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 {
        std::vector<LLUUID>::const_iterator it = items.begin();
        std::vector<LLUUID>::const_iterator end = items.end();
@@ -693,33 +783,66 @@ void open_offer(const std::vector<LLUUID>& items)
                {
                        continue;
                }
-                switch(item->getType())
+                //if we are throttled, don't display them - Gigs
+                if (check_offer_throttle(from_name, false))
                {
-                case LLAssetType::AT_NOTECARD:
+                        // I'm not sure this is a good idea.  JC
-                        open_notecard(*it, LLString("Note: ") + item->getName(), TRUE, LLUUID::null, FALSE);
+                        // bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
-                        break;
+                        bool show_keep_discard = true;
-                case LLAssetType::AT_LANDMARK:
+                        switch(item->getType())
-                        open_landmark(*it, LLString("Landmark: ") + item->getName(), TRUE, LLUUID::null, FALSE);
-                        break;
-                case LLAssetType::AT_TEXTURE:
-                        open_texture(*it, LLString("Texture: ") + item->getName(), TRUE, LLUUID::null, FALSE);
-                        break;
-                default:
-                {
-                        // Don't auto-open the inventory - just select it if we
-                        // already have an active inventory.
-                        LLInventoryView* view = LLInventoryView::getActiveInventory();
-                        if(view)
                        {
-                                LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
+                        case LLAssetType::AT_NOTECARD:
-                                LLFocusMgr::FocusLostCallback callback;
+                                open_notecard(*it, LLString("Note: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE);
-                                callback = gFocusMgr.getFocusCallback();
+                                break;
-                                view->getPanel()->setSelection(item->getUUID(), TAKE_FOCUS_NO);
+                        case LLAssetType::AT_LANDMARK:
-                                gFocusMgr.setKeyboardFocus(focus_ctrl, callback);
+                                open_landmark(*it, LLString("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);
+                                break;
+                        default:
                                break;
                        }
                }
+                //highlight item, if it's not in the trash or lost+found
+                
+                // Don't auto-open the inventory floater
+                LLInventoryView* view = LLInventoryView::getActiveInventory();
+                if(!view)
+                {
+                        return;
+                }
+                //Trash Check
+                LLUUID trash_id;
+                trash_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH);
+                if(gInventory.isObjectDescendentOf(item->getUUID(), trash_id))
+                {
+                        return;
                }
+                LLUUID lost_and_found_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LOST_AND_FOUND);
+                //BOOL inventory_has_focus = gFocusMgr.childHasKeyboardFocus(view);
+                BOOL user_is_away = gAwayTimer.getStarted();
+                // don't select lost and found items if the user is active
+                if (gInventory.isObjectDescendentOf(item->getUUID(), lost_and_found_id)
+                        && !user_is_away)
+                {
+                        return;
+                }
+                //Not sure about this check.  Could make it easy to miss incoming items. -Gigs
+                //don't dick with highlight while the user is working
+                //if(inventory_has_focus && !user_is_away)
+                //      break;
+                //llinfos << "Highlighting" << item->getUUID()  << llendl;
+                //highlight item
+                LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
+                LLFocusMgr::FocusLostCallback callback;
+                callback = gFocusMgr.getFocusCallback();
+                view->getPanel()->setSelection(item->getUUID(), TAKE_FOCUS_NO);
+                gFocusMgr.setKeyboardFocus(focus_ctrl, callback);
        }
 }
@@ -807,11 +930,11 @@ void inventory_offer_callback(S32 option, void* user_data)
                        char group_name[MAX_STRING];            /* Flawfinder: ignore */
                        if (gCacheName->getGroupName(info->mFromID, group_name))
                        {
-                                from_string = LLString("An object named ") + info->mFromName + " owned by the group '" + group_name + "'";
+                                from_string = LLString("An object named '") + info->mFromName + "' owned by the group '" + group_name + "'";
                        }
                        else
                        {
-                                from_string = LLString("An object named ") + info->mFromName + " owned by an unknown group";
+                                from_string = LLString("An object named '") + info->mFromName + "' owned by an unknown group";
                        }
                }
                else
@@ -820,11 +943,11 @@ void inventory_offer_callback(S32 option, void* user_data)
                        char last_name[MAX_STRING];             /* Flawfinder: ignore */
                        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 = LLString("An object named '") + info->mFromName + "' owned by " + first_name + " " + last_name;
                        }
                        else
                        {
-                                from_string = LLString("An object named ") + info->mFromName + " owned by an unknown user";
+                                from_string = LLString("An object named '") + info->mFromName + "' owned by an unknown user";
                        }
                }
        }
@@ -833,9 +956,11 @@ void inventory_offer_callback(S32 option, void* user_data)
                from_string = info->mFromName;
        }
        
+        bool busy=FALSE;
+        
        switch(option)
        {
-        case 0:
+        case IOR_ACCEPT:
                // ACCEPT. The math for the dialog works, because the accept
                // for inventory_offered, task_inventory_offer or
                // group_notice_inventory is 1 greater than the offer integer value.
@@ -846,9 +971,15 @@ void inventory_offer_callback(S32 option, void* user_data)
                                         sizeof(info->mFolderID.mData));
                // send the message
                msg->sendReliable(info->mHost);
-                log_message = info->mFromName + " gave you " + info->mDesc + ".";
-                chat.mText = log_message;
+                //don't spam them if they are getting flooded
-                LLFloaterChat::addChatHistory(chat);
+                if (check_offer_throttle(info->mFromName, true))
+                {
+                        log_message = info->mFromName + " gave you " + info->mDesc + ".";
+                        chat.mText = log_message;
+                        LLFloaterChat::addChatHistory(chat);
+                }
                // we will want to open this item when it comes back.
                lldebugs << "Initializing an opener for tid: " << info->mTransactionID
                                 << llendl;
@@ -861,7 +992,7 @@ void inventory_offer_callback(S32 option, void* user_data)
                        // so we can fetch it out of our inventory.
                        LLInventoryFetchObserver::item_ref_t items;
                        items.push_back(info->mObjectID);
-                        LLOpenAgentOffer* open_agent_offer = new LLOpenAgentOffer;
+                        LLOpenAgentOffer* open_agent_offer = new LLOpenAgentOffer(from_string);
                        open_agent_offer->fetchItems(items);
                        if(catp || (itemp && itemp->isComplete()))
                        {
@@ -877,22 +1008,10 @@ void inventory_offer_callback(S32 option, void* user_data)
                case IM_GROUP_NOTICE:
                case IM_GROUP_NOTICE_REQUESTED:
                {
-                                // This is an offer from a task or group.
+                        // This is an offer from a task or group.
-                                // Because it would be easy
+                        // We don't use a new instance of an opener
-                        // to write a task which would overload your inventory, we
+                        // We instead use the singular observer gOpenTaskOffer
-                        // force the offer to stay in an instant message until
+                        // Since it already exists, we don't need to actually do anything
-                        // accepted. Thus, we have to respond, and then wait for
-                        // the update to come back before we open the item.
-                        LLOpenTaskOffer* open_task_offer = new LLOpenTaskOffer;
-                        open_task_offer->watchItem(info->mObjectID);
-                        if(itemp && itemp->isComplete())
-                        {
-                                opener->changed(0x0);
-                        }
-                        else
-                        {
-                                opener = open_task_offer;
-                        }
                }
                break;
                default:
@@ -901,9 +1020,12 @@ void inventory_offer_callback(S32 option, void* user_data)
                }
                break;
-        case 2:
+        case IOR_BUSY:
+                //Busy falls through to decline.  Says to make busy message.
+                busy=TRUE;
+        case IOR_MUTE:
                // MUTE falls through to decline
-        case 1:
+        case IOR_DECLINE:
                // DECLINE. The math for the dialog works, because the decline
                // for inventory_offered, task_inventory_offer or
                // group_notice_inventory is 2 greater than the offer integer value.
@@ -941,7 +1063,7 @@ void inventory_offer_callback(S32 option, void* user_data)
                        }
                        
                }
-                if (!info->mFromGroup && !info->mFromObject)
+                if (busy || (!info->mFromGroup && !info->mFromObject))
                {
                        busy_message(msg,info->mFromID);
                }
@@ -964,88 +1086,73 @@ void inventory_offer_callback(S32 option, void* user_data)
 void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
 {
-        switch(info->mType)
+        //Until throttling is implmented, busy mode should reject inventory instead of silently
+        //accepting it.  SEE SL-39554
+        if (gAgent.getBusy())
+        {
+                inventory_offer_callback(IOR_BUSY, info);
+                return;
+        }
+        
+        //If muted, don't even go through the messaging stuff.  Just curtail the offer here.
+        if (gMuteListp->isMuted(info->mFromID, info->mFromName))
+        {
+                inventory_offer_callback(IOR_MUTE, info);
+                return;
+        }
+        
+        if (gSavedSettings.getBOOL("ShowNewInventory")
+                && (info->mType == LLAssetType::AT_NOTECARD
+                        || info->mType == LLAssetType::AT_LANDMARK
+                        || info->mType == LLAssetType::AT_TEXTURE))
        {
                // For certain types, just accept the items into the inventory,
                // and we'll automatically open them on receipt.
-          case LLAssetType::AT_NOTECARD:
+                // 0 = accept button
-          case LLAssetType::AT_LANDMARK:
+                inventory_offer_callback(IOR_ACCEPT, info);
-          case LLAssetType::AT_TEXTURE:
+                return;
-          {
+        }
-                  // 0 = accept button
-                  inventory_offer_callback(0, info);
+        LLString::format_map_t args;
-                  //LLInventoryView::sOpenNextNewItem = TRUE;
+        args["[OBJECTNAME]"] = info->mDesc;
-          }
+        args["[OBJECTTYPE]"] = LLAssetType::lookupHumanReadable(info->mType);
-          break;
+        // Name cache callbacks don't store userdata, so can't save
-          case LLAssetType::AT_SOUND:
+        // off the LLOfferInfo.  Argh.  JC
-          case LLAssetType::AT_CALLINGCARD:
+        BOOL name_found = FALSE;
-          case LLAssetType::AT_SCRIPT:
+        char first_name[MAX_STRING];            /* Flawfinder: ignore */
-          case LLAssetType::AT_CLOTHING:
+        char last_name[MAX_STRING];             /* Flawfinder: ignore */
-          case LLAssetType::AT_OBJECT:
+        if (info->mFromGroup)
-          case LLAssetType::AT_CATEGORY:
+        {
-          case LLAssetType::AT_ROOT_CATEGORY:
+                if (gCacheName->getGroupName(info->mFromID, first_name))
-          case LLAssetType::AT_LSL_TEXT:
+                {
-          case LLAssetType::AT_LSL_BYTECODE:
+                        args["[FIRST]"] = first_name;
-          case LLAssetType::AT_TEXTURE_TGA:
+                        args["[LAST]"] = "";
-          case LLAssetType::AT_BODYPART:
+                        name_found = TRUE;
-          case LLAssetType::AT_TRASH:
+                }
-          case LLAssetType::AT_SNAPSHOT_CATEGORY:
+        }
-          case LLAssetType::AT_LOST_AND_FOUND:
+        else
-          case LLAssetType::AT_ANIMATION:
+        {
-          case LLAssetType::AT_GESTURE:
+                if (gCacheName->getName(info->mFromID, first_name, last_name))
-          default:
+                {
-          {
+                        args["[FIRST]"] = first_name;
-                  LLString::format_map_t args;
+                        args["[LAST]"] = last_name;
-                  args["[OBJECTNAME]"] = info->mDesc;
+                        name_found = TRUE;
-                  args["[OBJECTTYPE]"] = LLAssetType::lookupHumanReadable(info->mType);
+                }
+        }
-                  // Name cache callbacks don't store userdata, so can't save
+        if (from_task)
-                  // off the LLOfferInfo.  Argh.  JC
+        {
-                  BOOL name_found = FALSE;
+                args["[OBJECTFROMNAME]"] = info->mFromName;
-                  char first_name[MAX_STRING];          /* Flawfinder: ignore */
+                LLNotifyBox::showXml(name_found ? "ObjectGiveItem" : "ObjectGiveItemUnknownUser",
-                  char last_name[MAX_STRING];           /* Flawfinder: ignore */
+                                                        args, &inventory_offer_callback, (void*)info);
-                  if (info->mFromGroup)
+        }
-                  {
+        else
-                          if (gCacheName->getGroupName(info->mFromID, first_name))
+        {
-                          {
+                // XUI:translate -> [FIRST] [LAST]
-                                  args["[FIRST]"] = first_name;
+                args["[NAME]"] = info->mFromName;
-                                  args["[LAST]"] = "";
+                LLNotifyBox::showXml("UserGiveItem", args,
-                                  name_found = TRUE;
+                                                        &inventory_offer_callback, (void*)info);
-                          }
-                  }
-                  else
-                  {
-                          if (gCacheName->getName(info->mFromID, first_name, last_name))
-                          {
-                                  args["[FIRST]"] = first_name;
-                                  args["[LAST]"] = last_name;
-                                  name_found = TRUE;
-                          }
-                  }
-                  if (from_task)
-                  {
-                          args["[OBJECTFROMNAME]"] = info->mFromName;
-                          if (name_found)
-                          {
-                                  LLNotifyBox::showXml("ObjectGiveItem", args,
-                                                                           &inventory_offer_callback, (void*)info);
-                          }
-                          else
-                          {
-                                  LLNotifyBox::showXml("ObjectGiveItemUnknownUser", args,
-                                                                           &inventory_offer_callback, (void*)info);
-                          }
-                  }
-                  else
-                  {
-                          // XUI:translate -> [FIRST] [LAST]
-                          args["[NAME]"] = info->mFromName;
-                          LLNotifyBox::showXml("UserGiveItem", args,
-                                                                   &inventory_offer_callback, (void*)info);
-                  }
-                  break;
-          }
        }
 }
@@ -1538,10 +1645,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                        }
                        else
                        {
-                                if (dialog == IM_TASK_INVENTORY_OFFERED)
+                                inventory_offer_handler(info, dialog == IM_TASK_INVENTORY_OFFERED);
-                                        inventory_offer_handler(info, TRUE);
-                                else
-                                        inventory_offer_handler(info, FALSE);
                        }
                }
                break;
@@ -1760,6 +1864,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
        case IM_GOTO_URL:
                {
+                        if (binary_bucket_size <= 0)
+                        {
+                                llwarns << "bad binary_bucket_size: "
+                                        << binary_bucket_size
+                                        << " - aborting function." << llendl;
+                                return;
+                        }
                        char* url = new char[binary_bucket_size];
                        if (url == NULL)
                        {
@@ -1985,16 +2097,22 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
                {
                        // automatically decline offer
                        callingcard_offer_callback(1, (void*)offerdata);
-                        return;
+                        offerdata = NULL; // pointer was freed by callback
+                }
+                else
+                {
+                        LLNotifyBox::showXml("OfferCallingCard", args,
+                                             &callingcard_offer_callback, (void*)offerdata);
+                        offerdata = NULL; // pointer ownership transferred
                }
-                LLNotifyBox::showXml("OfferCallingCard", args,
-                                                         &callingcard_offer_callback, (void*)offerdata);
        }
        else
        {
                llwarns << "Calling card offer from an unknown source." << llendl;
        }
+        delete offerdata; // !=NULL if we didn't give ownership away
+        offerdata = NULL;
 }
 void process_accept_callingcard(LLMessageSystem* msg, void**)
@@ -3609,7 +3727,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data)
        if (object)
        {
                LLVector3 sit_spot = object->getPositionAgent() + (sitPosition * object->getRotation());
-                if (!use_autopilot || (avatar->mIsSitting && avatar->getRoot() == object->getRoot()))
+                if (!use_autopilot || (avatar && avatar->mIsSitting && avatar->getRoot() == object->getRoot()))
                {
                        //we're already sitting on this object, so don't autopilot
                }
@@ -5002,9 +5120,10 @@ void onCovenantLoadComplete(LLVFS *vfs,
                
                if( (file_length > 19) && !strncmp( buffer, "Linden text version", 19 ) )
                {
-                        LLViewerTextEditor* editor = new LLViewerTextEditor("temp",
+                        LLViewerTextEditor* editor =
-                                                                                                                                LLRect(0,0,0,0),
+                                new LLViewerTextEditor("temp",
-                                                                                                                                file_length+1);
+                                                       LLRect(0,0,0,0),
+                                                       file_length+1);
                        if( !editor->importBuffer( buffer ) )
                        {
                                llwarns << "Problem importing estate covenant." << llendl;
@@ -5020,27 +5139,32 @@ void onCovenantLoadComplete(LLVFS *vfs,
                }
                else
                {
-                        if( gViewerStats )
+                        llwarns << "Problem importing estate covenant: Covenant file format error." << llendl;
-                        {
+                        covenant_text = "Problem importing estate covenant: Covenant file format error.";
-                                gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
+                }
-                        }
+        }
+        else
-                        if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
+        {
-                                LL_ERR_FILE_EMPTY == status)
+                if( gViewerStats )
-                        {
+                {
-                                covenant_text = "Estate covenant notecard is missing from database.";
+                        gViewerStats->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                        }
-                        else if (LL_ERR_INSUFFICIENT_PERMISSIONS == status)
-                        {
-                                covenant_text = "Insufficient permissions to view estate covenant.";
-                        }
-                        else
-                        {
-                                covenant_text = "Unable to load estate covenant at this time.";
-                        }
-                        llwarns << "Problem loading notecard: " << status << llendl;
                }
+                
+                if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
+                    LL_ERR_FILE_EMPTY == status)
+                {
+                        covenant_text = "Estate covenant notecard is missing from database.";
+                }
+                else if (LL_ERR_INSUFFICIENT_PERMISSIONS == status)
+                {
+                        covenant_text = "Insufficient permissions to view estate covenant.";
+                }
+                else
+                {
+                        covenant_text = "Unable to load estate covenant at this time.";
+                }
+                
+                llwarns << "Problem loading notecard: " << status << llendl;
        }
        LLPanelEstateCovenant::updateCovenantText(covenant_text, asset_uuid);
        LLPanelLandCovenant::updateCovenantText(covenant_text);
diff --git a/linden/indra/newview/llviewermessage.h b/linden/indra/newview/llviewermessage.h
index ce8f6a7..14f2cda 100644
--- a/linden/indra/newview/llviewermessage.h
+++ b/linden/indra/newview/llviewermessage.h
@@ -48,6 +48,14 @@ class LLViewerRegion;
 // Prototypes
 //
+enum InventoryOfferResponse
+{
+        IOR_ACCEPT,
+        IOR_DECLINE,
+        IOR_MUTE,
+        IOR_BUSY
+};
 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);
@@ -190,6 +198,7 @@ void invalid_message_callback(LLMessageSystem*, void*, EMessageException);
 void process_initiate_download(LLMessageSystem* msg, void**);
 void inventory_offer_callback(S32 option, void* user_data);
+void start_new_inventory_observer();
 struct LLOfferInfo
 {
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 5cb65b6..58d57b5 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -639,10 +639,10 @@ BOOL LLViewerObject::setDrawableParent(LLDrawable* parentp)
 }
 U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
-                                                                                  void **user_data,
+                                         void **user_data,
-                                                                                  U32 block_num,
+                                         U32 block_num,
-                                                                                  const EObjectUpdateType update_type,
+                                         const EObjectUpdateType update_type,
-                                                                                  LLDataPacker *dp)
+                                         LLDataPacker *dp)
 {
        LLMemType mt(LLMemType::MTYPE_OBJECT);
        
@@ -658,6 +658,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                from_region_handle(region_handle, &x, &y);
                llerrs << "Object has invalid region " << x << ":" << y << "!" << llendl;
+                return retval;
        }
        U16 time_dilation16;
@@ -934,7 +935,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                // Check for appended generic data
                                S32 data_size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_Data);
-                                if (data_size == 0)
+                                if (data_size <= 0)
                                {
                                        mData = NULL;
                                }
@@ -1757,9 +1758,16 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
        if (gPingInterpolate)
        { 
                LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit(mesgsys->getSender());
-                F32 ping_delay = 0.5f * mTimeDilation * ( ((F32)cdp->getPingDelay()) * 0.001f + gFrameDTClamped);
+                if (cdp)
-                LLVector3 diff = getVelocity() * (0.5f*mTimeDilation*(gFrameDTClamped + ((F32)ping_delay)*0.001f)); 
+                {
-                new_pos_parent += diff;
+                        F32 ping_delay = 0.5f * mTimeDilation * ( ((F32)cdp->getPingDelay()) * 0.001f + gFrameDTClamped);
+                        LLVector3 diff = getVelocity() * (0.5f*mTimeDilation*(gFrameDTClamped + ((F32)ping_delay)*0.001f)); 
+                        new_pos_parent += diff;
+                }
+                else
+                {
+                        llwarns << "findCircuit() returned NULL; skipping interpolation" << llendl;
+                }
        }
        //////////////////////////
@@ -4134,7 +4142,7 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
        {
                return;
        }
+        
        if (audio_uuid.isNull())
        {
                if (mAudioSourcep && mAudioSourcep->isLoop() && !mAudioSourcep->hasPendingPreloads())
@@ -4169,7 +4177,8 @@ void LLViewerObject::setAttachedSound(const LLUUID &audio_uuid, const LLUUID& ow
                }
        }
-        if ( mAudioSourcep )
+                // don't clean up before previous sound is done. Solves: SL-33486
+        if ( mAudioSourcep && mAudioSourcep->isDone() ) 
        {
                gAudiop->cleanupAudioSource(mAudioSourcep);
                mAudioSourcep = NULL;
diff --git a/linden/indra/newview/llviewerparceloverlay.cpp b/linden/indra/newview/llviewerparceloverlay.cpp
index d5ad910..e31b714 100644
--- a/linden/indra/newview/llviewerparceloverlay.cpp
+++ b/linden/indra/newview/llviewerparceloverlay.cpp
@@ -485,20 +485,21 @@ void LLViewerParcelOverlay::updatePropertyLines()
        // shuffling.
        S32 new_vertex_count = new_vertex_array.count();
        
-        // NOTE: If the new_vertex_count is 0 and wasn't 0 previously
+        if (!(mVertexArray && mColorArray && new_vertex_count == mVertexCount))
-        // the arrays are still allocated as the arrays aren't set to NULL, etc.
-        // This won't cause any problems, but might waste a few cycles copying over
-        // old data. - jwolk
-        if ( !(mVertexArray && mColorArray && new_vertex_count == mVertexCount) && new_vertex_count > 0 )
        {
                // ...need new arrays
                delete[] mVertexArray;
+                mVertexArray = NULL;
                delete[] mColorArray;
+                mColorArray = NULL;
                mVertexCount = new_vertex_count;
-                mVertexArray   = new F32[3 * mVertexCount];
+                if (new_vertex_count > 0)
-                mColorArray    = new U8 [4 * mVertexCount];
+                {
+                        mVertexArray   = new F32[3 * mVertexCount];
+                        mColorArray    = new U8 [4 * mVertexCount];
+                }
        }
        // Copy the new data into the arrays
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 9498dbd..c57c84a 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1504,27 +1504,8 @@ LLViewerWindow::LLViewerWindow(
        // stuff like AGP if we think that it'll crash the viewer.
        //
        gFeatureManagerp->initGraphicsFeatureMasks();
-        // The ATI Mobility Radeon with 1.15.0 causes crashes in FMOD on startup for
-        // unknown reasons, but only if you have an old settings.ini file.
-        // In this case, force the graphics settings back to recommended, but only
-        // do it once. JC
-        std::string gpu_string = gFeatureManagerp->getGPUString();
-        LLString::toLower(gpu_string);
-        bool upgrade_to_1_15 = (gSavedSettings.getString("LastRunVersion") != "1.15.0");
-        bool mobility_radeon = (gpu_string.find("mobility radeon") != std::string::npos);
-        bool mobility_radeon_upgrade_hack = upgrade_to_1_15 && mobility_radeon;
-        if (mobility_radeon_upgrade_hack)
-        {
-                llinfos << "1.15.0 update on Mobility Radeon" << llendl;
-                llinfos << "Forcing recommended graphics settings" << llendl;
-                llinfos << "Forcing audio off" << llendl;
-                gUseAudio = FALSE;
-        }
        if (gFeatureManagerp->isSafe()
-                || (gSavedSettings.getS32("LastFeatureVersion") != gFeatureManagerp->getVersion())
+                || (gSavedSettings.getS32("LastFeatureVersion") != gFeatureManagerp->getVersion()))
-                || mobility_radeon_upgrade_hack)
        {
                gFeatureManagerp->applyRecommendedFeatures();
        }
@@ -1747,7 +1728,7 @@ void LLViewerWindow::initBase()
        mToolTip->setBorderVisible( FALSE );
        mToolTip->setBackgroundColor( gColors.getColor( "ToolTipBgColor" ) );
        mToolTip->setBackgroundVisible( TRUE );
-        mToolTip->setDropshadowVisible( FALSE );
+        mToolTip->setFontStyle(LLFontGL::NORMAL);
        mToolTip->setBorderDropshadowVisible( TRUE );
        mToolTip->setVisible( FALSE );
diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index af0fe96..370bf24 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -126,6 +126,13 @@ BOOL LLVLComposition::generateHeights(const F32 x, const F32 y,
        }
        llassert(mSurfacep);
+        if (!mSurfacep || !mSurfacep->getRegion()) 
+        {
+                // We don't always have the region yet here....
+                return FALSE;
+        }
        S32 x_begin, y_begin, x_end, y_end;
        x_begin = llround( x * mScaleInv );
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 25c6eb6..37380a4 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -1486,6 +1486,7 @@ void LLVOAvatar::initClass()
        if (!root) 
        {
                llerrs << "No root node found in avatar configuration file: " << xmlFile << llendl;
+                return;
        }
        //-------------------------------------------------------------------------
@@ -1893,6 +1894,7 @@ void LLVOAvatar::buildCharacter()
                mEyeRightp))
        {
                llerrs << "Failed to create avatar." << llendl;
+                return;
        }
        //-------------------------------------------------------------------------
@@ -2461,7 +2463,7 @@ BOOL LLVOAvatar::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                
        if (LLVOAvatar::sJointDebug)
        {
-                llinfos << getNVPair("FirstName")->getString() << getNVPair("LastName")->getString() << ": joint touches: " << LLJoint::sNumTouches << " updates: " << LLJoint::sNumUpdates << llendl;
+                llinfos << getFullname() << ": joint touches: " << LLJoint::sNumTouches << " updates: " << LLJoint::sNumUpdates << llendl;
        }
        LLJoint::sNumUpdates = 0;
@@ -4809,7 +4811,7 @@ BOOL LLVOAvatar::allocateCollisionVolumes( U32 num )
 LLJoint *LLVOAvatar::getCharacterJoint( U32 num )
 {
        if ((S32)num >= mNumJoints 
-                || num < 0)
+            || (S32)num < 0)
        {
                return NULL;
        }
diff --git a/linden/indra/newview/llvoclouds.cpp b/linden/indra/newview/llvoclouds.cpp
index 24084cf..be7c1b1 100644
--- a/linden/indra/newview/llvoclouds.cpp
+++ b/linden/indra/newview/llvoclouds.cpp
@@ -126,6 +126,12 @@ BOOL LLVOClouds::updateGeometry(LLDrawable *drawable)
        for ( ; face_indx < num_faces; face_indx++)
        {
                facep = drawable->getFace(face_indx);
+                if (!facep)
+                {
+                        llwarns << "No facep for index " << face_indx << llendl;
+                        continue;
+                }
                if (isParticle())
                {
                        facep->setSize(1,1);
@@ -143,6 +149,12 @@ BOOL LLVOClouds::updateGeometry(LLDrawable *drawable)
        for ( ; face_indx < drawable->getNumFaces(); face_indx++)
        {
                facep = drawable->getFace(face_indx);
+                if (!facep)
+                {
+                        llwarns << "No facep for index " << face_indx << llendl;
+                        continue;
+                }
                facep->setTEOffset(face_indx);
                facep->setSize(0,0);
        }
diff --git a/linden/indra/newview/llvopartgroup.cpp b/linden/indra/newview/llvopartgroup.cpp
index 28aeb29..fbf753a 100644
--- a/linden/indra/newview/llvopartgroup.cpp
+++ b/linden/indra/newview/llvopartgroup.cpp
@@ -151,7 +151,7 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
        if (!num_parts)
        {
-                if (drawable->getNumFaces())
+                if (group && drawable->getNumFaces())
                {
                        group->dirtyGeom();
                }
@@ -206,6 +206,12 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
                count++;
                facep = drawable->getFace(i);
+                if (!facep)
+                {
+                        llwarns << "No face found for index " << i << "!" << llendl;
+                        continue;
+                }
                facep->setTEOffset(i);
                const F32 NEAR_PART_DIST_SQ = 5.f*5.f;  // Only discard particles > 5 m from the camera
                const F32 MIN_PART_AREA = .005f*.005f;  // only less than 5 mm x 5 mm at 1 m from camera
@@ -259,6 +265,11 @@ BOOL LLVOPartGroup::updateGeometry(LLDrawable *drawable)
        for (i = count; i < drawable->getNumFaces(); i++)
        {
                LLFace* facep = drawable->getFace(i);
+                if (!facep)
+                {
+                        llwarns << "No face found for index " << i << "!" << llendl;
+                        continue;
+                }
                facep->setTEOffset(i);
                facep->setSize(0,0);
        }
diff --git a/linden/indra/newview/llwindebug.cpp b/linden/indra/newview/llwindebug.cpp
index 6221b85..7433984 100644
--- a/linden/indra/newview/llwindebug.cpp
+++ b/linden/indra/newview/llwindebug.cpp
@@ -131,6 +131,8 @@ BOOL LLWinDebug::setupExceptionHandler()
                        if (!f_mdwp)
                        {
                                write_debug("No MiniDumpWriteDump!\n");
+                                FreeLibrary(hDll);
+                                hDll = NULL;
                                ok = FALSE;
                        }
                }
diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index f2a2c90..db7ac19 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -491,7 +491,7 @@ void LLWorldMap::processMapBlockReply(LLMessageSystem* msg, void**)
        U32 agent_flags;
        msg->getU32Fast(_PREHASH_AgentData, _PREHASH_Flags, agent_flags);
-        if (agent_flags < 0 || agent_flags >= MAP_SIM_IMAGE_TYPES)
+        if ((S32)agent_flags < 0 || agent_flags >= MAP_SIM_IMAGE_TYPES)
        {
                llwarns << "Invalid map image type returned! " << agent_flags << llendl;
                return;
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 01dd1b8..328af72 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -178,7 +178,6 @@ LLWorldMapView::LLWorldMapView(const std::string& name, const LLRect& rect )
        LLRect major_dir_rect(  0, DIR_HEIGHT, DIR_WIDTH, 0 );
        mTextBoxNorth = new LLTextBox( "N", major_dir_rect );
-        mTextBoxNorth->setDropshadowVisible( TRUE );
        addChild( mTextBoxNorth );
        LLColor4 minor_color( 1.f, 1.f, 1.f, .7f );
diff --git a/linden/indra/newview/macview.xcodeproj/project.pbxproj b/linden/indra/newview/macview.xcodeproj/project.pbxproj
index 9534878..8bc52b1 100644
--- a/linden/indra/newview/macview.xcodeproj/project.pbxproj
+++ b/linden/indra/newview/macview.xcodeproj/project.pbxproj
@@ -40,6 +40,8 @@
                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 */; };
                1A89230A08B12D9900A04AA9 /* llmediabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A89230908B12D9800A04AA9 /* llmediabase.cpp */; };
@@ -850,6 +852,11 @@
                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>"; };
@@ -2334,6 +2341,8 @@
                                1A83767C0BA2169600F28979 /* llviewergenericmessage.h */,
                                1A83767D0BA2169600F28979 /* llviewergenericmessage.cpp */,
                                9C18425A0B9F951500208356 /* llcaphttpsender.cpp */,
+                                1A8870E30BCC5A9500E89AA6 /* llviewermenufile.h */,
+                                1A8870E40BCC5A9500E89AA6 /* llviewermenufile.cpp */,
                                A3C20E4B0BB0BD12007E872B /* llviewerjoystick.cpp */,
                                A3C20E490BB0BCDF007E872B /* llglslshader.cpp */,
                                AAF5FFD00B13F71900D28A84 /* lltexturecache.cpp */,
@@ -2863,6 +2872,8 @@
                6192217F074A9B58005E1F34 /* llinventory */ = {
                        isa = PBXGroup;
                        children = (
+                                1A8870D30BCC5A6300E89AA6 /* llinventorytype.h */,
+                                1A8870D40BCC5A6300E89AA6 /* llinventorytype.cpp */,
                                913B26970B4DDCDA0030C3EC /* lllandmark.cpp */,
                                913B26980B4DDCDA0030C3EC /* lllandmark.h */,
                                C1F5D0A30B138AEB00827F1D /* lluserrelations.cpp */,
@@ -3499,6 +3510,7 @@
                        isa = PBXGroup;
                        children = (
                                9C1842500B9F94F200208356 /* llcaphttpsender.h */,
+                                1A8870E60BCC5AAD00E89AA6 /* llresourcedata.h */,
                                A3C20E4E0BB0BD49007E872B /* llviewerjoystick.h */,
                                A3C20E4D0BB0BD37007E872B /* llglslshader.h */,
                                1AF7C1F20AF6C45000C4BF4A /* llweb.h */,
@@ -4538,6 +4550,8 @@
                                9C659A870BAB0B6E00D2EB60 /* llmessageconfig.cpp in Sources */,
                                A3C20E4A0BB0BCDF007E872B /* llglslshader.cpp in Sources */,
                                A3C20E4C0BB0BD12007E872B /* llviewerjoystick.cpp in Sources */,
+                                1A8870D50BCC5A6300E89AA6 /* llinventorytype.cpp in Sources */,
+                                1A8870E50BCC5A9500E89AA6 /* llviewermenufile.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
diff --git a/linden/indra/newview/newview.vcproj b/linden/indra/newview/newview.vcproj
index 33c2d90..699a2bc 100644
--- a/linden/indra/newview/newview.vcproj
+++ b/linden/indra/newview/newview.vcproj
@@ -1121,6 +1121,9 @@
                                RelativePath=".\llviewermenu.cpp">
                        </File>
                        <File
+                                RelativePath=".\llviewermenufile.cpp">
+                        </File>
+                        <File
                                RelativePath=".\llviewermessage.cpp">
                        </File>
                        <File
@@ -1942,6 +1945,9 @@
                                RelativePath=".\llregionposition.h">
                        </File>
                        <File
+                                RelativePath=".\llresourcedata.h">
+                        </File>
+                        <File
                                RelativePath=".\llrig.h">
                        </File>
                        <File
@@ -2146,6 +2152,9 @@
                                RelativePath=".\llviewermenu.h">
                        </File>
                        <File
+                                RelativePath=".\llviewermenufile.h">
+                        </File>
+                        <File
                                RelativePath=".\llviewermessage.h">
                        </File>
                        <File
@@ -2863,6 +2872,9 @@
                        </File>
                </Filter>
                <File
+                        RelativePath=".\files.lst">
+                </File>
+                <File
                        RelativePath=".\llviewerprecompiledheaders.cpp">
                        <FileConfiguration
                                Name="Debug|Win32">
diff --git a/linden/indra/newview/newview_vc8.vcproj b/linden/indra/newview/newview_vc8.vcproj
index e98c4ed..4cb359b 100644
--- a/linden/indra/newview/newview_vc8.vcproj
+++ b/linden/indra/newview/newview_vc8.vcproj
@@ -41,13 +41,12 @@
                        <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;"
+                                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;;..\llwindow\Logitech_LCD;..\llwindow\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"
+                                PreprocessorDefinitions="WIN32;_DEBUG;LL_WINDOWS;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"
@@ -67,7 +66,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib-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 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"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.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-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llmozlib.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.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 lglcd.lib"
                                OutputFile="$(ConfigurationName)/debugview.exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_debug&quot;"
@@ -133,7 +132,7 @@
                                Name="VCCLCompilerTool"
                                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;"
+                                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;;..\llwindow\Logitech_LCD;..\llwindow\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"
@@ -158,7 +157,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib-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 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"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib-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 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 lglcd.lib"
                                OutputFile="$(ConfigurationName)/newview.exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -225,12 +224,10 @@
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                                WholeProgramOptimization="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;;..\llwindow\Logitech_LCD;..\llwindow\Logitech_LCD\LCDUI"
-                                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;"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;LL_RELEASE_FOR_DOWNLOAD;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
-                                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"
@@ -249,7 +246,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib-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 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"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.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-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib.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 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 lglcd.lib"
                                OutputFile="$(ConfigurationName)/SecondLife.exe"
                                LinkIncremental="0"
                                AdditionalLibraryDirectories="&quot;../lib_release/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -259,7 +256,6 @@
                                SubSystem="2"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
-                                LinkTimeCodeGeneration="1"
                                TargetMachine="1"
                        />
                        <Tool
@@ -315,15 +311,13 @@
                        <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;"
+                                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;;..\llwindow\Logitech_LCD;..\llwindow\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"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;LL_WINDOWS;LL_RELEASE;XP_WIN;XP_WIN32;MOZILLA_INTERNAL_API"
                                RuntimeLibrary="0"
                                StructMemberAlignment="0"
-                                TreatWChar_tAsBuiltInType="false"
                                ForceConformanceInForLoopScope="true"
                                UsePrecompiledHeader="2"
                                PrecompiledHeaderThrough="llviewerprecompiledheaders.h"
-                                BrowseInformation="1"
                                WarningLevel="3"
                                WarnAsError="true"
                                Detect64BitPortabilityProblems="false"
@@ -340,7 +334,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib fmodvc.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc80-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llaudio.lib llmedia.lib llcharacter.lib llcommon.lib llimage.lib llimagej2coj.lib llinventory.lib llmath.lib llmessage.lib llmozlib-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 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"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.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-s.lib libcurl.lib libeay32.lib libexpatMT.lib LibOpenJPEG.lib llmozlib.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ogg_static_mt.lib ole32.lib oleaut32.lib opengl32.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 lglcd.lib"
                                OutputFile="$(ConfigurationName)/newview_noopt.exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="&quot;../lib_releasenoopt/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -979,6 +973,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\lllcd.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\lllocalanimationobject.cpp"
                                >
                        </File>
@@ -1175,6 +1173,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llpanelLCD.cpp"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llpanellogin.cpp"
                                >
                        </File>
@@ -1753,10 +1755,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llagparray.h"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llanimalcontrols.h"
                                >
                        </File>
@@ -1893,18 +1891,10 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\lldrawpoolclouds.h"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\lldrawpoolground.h"
                                >
                        </File>
                        <File
-                                RelativePath=".\lldrawpoolhud.h"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\lldrawpoolsimple.h"
                                >
                        </File>
@@ -1925,10 +1915,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\lldrawpooltreenew.h"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\lldrawpoolwater.h"
                                >
                        </File>
@@ -2337,6 +2323,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\lllcd.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\lllightconstants.h"
                                >
                        </File>
@@ -2537,6 +2527,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\llpanelLCD.h"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\llpanellogin.h"
                                >
                        </File>
@@ -3041,10 +3035,6 @@
                                >
                        </File>
                        <File
-                                RelativePath=".\llvotreenew.h"
-                                >
-                        </File>
-                        <File
                                RelativePath=".\llvovolume.h"
                                >
                        </File>
@@ -3487,6 +3477,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\res\icon1.ico"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\Info-SecondLife.plist"
                                >
                        </File>
@@ -3507,6 +3501,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\skins\xui\en-us\LCD_text.xml"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\res\ll_icon.ico"
                                >
                        </File>
@@ -3751,6 +3749,10 @@
                                >
                        </File>
                        <File
+                                RelativePath=".\skins\xui\en-us\panel_preferences_LCD.xml"
+                                >
+                        </File>
+                        <File
                                RelativePath=".\skins\xui\en-us\panel_preferences_network.xml"
                                >
                        </File>
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 5d4618e..d030ac2 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -768,6 +768,7 @@ void LLPipeline::updateMoveDampedAsync(LLDrawable* drawablep)
        if (!drawablep)
        {
                llerrs << "updateMove called with NULL drawablep" << llendl;
+                return;
        }
        if (drawablep->isState(LLDrawable::EARLY_MOVE))
        {
@@ -1124,7 +1125,7 @@ void LLPipeline::updateGeom(F32 max_dtime)
                last_bridge = bridge;
                BOOL update_complete = TRUE;
-                if (drawablep && !drawablep->isDead())
+                if (!drawablep->isDead())
                {
                        update_complete = updateDrawableGeom(drawablep, FALSE);
                        count++;
@@ -1398,7 +1399,9 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera)
        LLMemType mt(LLMemType::MTYPE_PIPELINE);
        LLFastTimer ftm(LLFastTimer::FTM_STATESORT_DRAWABLE);
        
-        if (drawablep->isDead() || !hasRenderType(drawablep->getRenderType()))
+        if (!drawablep
+                || drawablep->isDead() 
+                || !hasRenderType(drawablep->getRenderType()))
        {
                return;
        }
@@ -1412,7 +1415,7 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera)
                }
        }
-        if (drawablep && (hasRenderType(drawablep->mRenderType)))
+        if (hasRenderType(drawablep->mRenderType))
        {
                if (!drawablep->isState(LLDrawable::INVISIBLE|LLDrawable::FORCE_INVISIBLE))
                {
@@ -1835,6 +1838,7 @@ void LLPipeline::renderHighlights()
                        if (!facep || facep->getDrawable()->isDead())
                        {
                                llerrs << "Bad face on selection" << llendl;
+                                return;
                        }
                        
                        facep->renderSelected(mFaceSelectImagep, color);
@@ -4045,4 +4049,4 @@ void LLPipeline::renderBloom(GLuint source, GLuint dest, GLuint buffer, U32 res,
        glPopMatrix();
        glMatrixMode(GL_MODELVIEW);
        glPopMatrix();
-}
-\ No newline at end of file
+}
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index 2fc26c7..c6c57f0 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,6 +1,54 @@
+Release Notes for Second Life 1.15.1(3) May 14, 2007 
+=====================================
+Changes:
+* Soft shadow for text is now an option available via the text style flag
+* Expanded Tools->Report Bug to include additional information and links
+* Alt-Left and Alt-Right switch between tabs in IM
+* Ctrl-W closes one tab in IM window (Ctrl-T closes IM window)
+* Ctrl-Shift-W closes all windows
+* Inventory system folders may be sorted to top
+* Busy mode declines notecards and textures and silently sends all other transfers to Inventory
+* L$ balance displays "Loading..." (instead of a blank) when first checking your balance
+* Minimap is enabled when Second Life runs for the first time
+* Texture transfers are limited to 5 items per 10 seconds
+Bug fixes:
+* Fixed windows maximizing when opening other windows
+* Fixed floating text inworld (original hard shadow restored)
+* Fixed LSL Help window restoring when clicking on script editor
+* Fixed LSL Wiki Help window forgetting its size
+* Fixed Ctrl-W closing the floater instead of one IM panel
+* Fixed a client crash when deleting an object from inventory
+* Fixed avatar eyeball shader
+* Fixed closing an inventory folder while selection is inside moves selection to 'My Inventory'
+* Fixed nametag text leaving background box while moving
+* Fixed graphics cards with unlisted memory sizes defaulting to 16MB
+* Fixed right-clicking on self failing if you are wearing a HUD
+* Fixed llSetText appearance on HUD attachments
+* Fixed Alt-WASD behavior when sitting
+* Fixed first digit in Pay dialog cannot be erased
+* Fixed reference ruler measuring to region edge instead of reference object
+* Fixed permissions on group-owned object's script when group member clicks New Script
+* Improved detection of Linux video memory
+* VWR-38: Magic Opening Folders
+* VWR-42: llSetSoundQueueing() is broken
+* VWR-71: Tabulating and moving by word (Ctrl-left, ctrl-right) off-by-one errors in scripting editor.
+* VWR-136: Seg fault in llpolymorph.cpp
+* VWR-148: llListStatistics tooltip wrong
+* VWR-154: typo in en-US/floater_mute.xml 'Resident' not 'resident'
+* VWR-155: typo in en-US/floater_mute.xml 'Resident' not 'Person'
+* VWR-165: First Digit in the 'Pay' dialog does not erase without entering more digits
+* VWR-166: moving of open folders in the inventory to an other indentation level leaves the contents on the previous level
+* VWR-192: textures in windows only stretches horizontally
+* VWR-326: Allow a 'limit texture recieving' in the client
+* VWR-346: Selecting Client>Character>Flush Animations immediately crashes 1.14.0.x
+* VWR-379: Fix shell scripts to use bash and not sh when appropriate.
+* VWR-414: 8-bit character in llagent.cpp comment confuses Japanese text editors
+* VWR-415: Definitions of WM_MOUSEWHEEL and WHEEL_DELTA need conditionals (on Windows)
+* VWR-429: add scons option making FMOD optional
 Release Notes for Second Life 1.15.0(2) April 25, 2007 
 ===================================== 
 Changes:
 * Improved Help menu with links to additional resources
 * 'Add as Friend' button added to Profile 
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index e544a39..e9ac143 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -227,8 +227,8 @@ TOOLPIPETTE             CURSOR                  "toolpipette.cur"
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,15,0,2
+ FILEVERSION 1,15,1,3
- PRODUCTVERSION 1,15,0,2
+ PRODUCTVERSION 1,15,1,3
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -245,12 +245,12 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Linden Lab"
            VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.15.0.2"
+            VALUE "FileVersion", "1.15.1.3"
            VALUE "InternalName", "Second Life"
            VALUE "LegalCopyright", "Copyright � 2001-2007, Linden Research, Inc."
            VALUE "OriginalFilename", "SecondLife.exe"
            VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.15.0.2"
+            VALUE "ProductVersion", "1.15.1.3"
        END
    END
    BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/secondlife setup build uma.bat b/linden/indra/newview/secondlife setup build uma.bat
index 72c27fb..ad2d849 100644
--- a/linden/indra/newview/secondlife setup build uma.bat
+++ b/linden/indra/newview/secondlife setup build uma.bat
@@ -1,4 +1,4 @@
-@rem Invoke the script which preps then runs the installer.
+@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
+@rem This batch file is customized per grid.
-@"secondlife setup build.bat" --grid=uma
+@"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
index 2036c33..f957918 100644
--- a/linden/indra/newview/secondlife setup build vaak.bat
+++ b/linden/indra/newview/secondlife setup build vaak.bat
@@ -1,4 +1,4 @@
-@rem Invoke the script which preps then runs the installer.
+@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
+@rem This batch file is customized per grid.
-@"secondlife setup build.bat" --grid=vaak
+@"secondlife setup build.bat" --grid=vaak
diff --git a/linden/indra/newview/secondlife setup build yami.bat b/linden/indra/newview/secondlife setup build yami.bat
index ffc8568..4f88805 100644
--- a/linden/indra/newview/secondlife setup build yami.bat
+++ b/linden/indra/newview/secondlife setup build yami.bat
@@ -1,4 +1,4 @@
-@rem Invoke the script which preps then runs the installer.
+@rem Invoke the script which preps then runs the installer.
-@rem This batch file is customized per grid.
+@rem This batch file is customized per grid.
-@"secondlife setup build.bat" --grid=yami
+@"secondlife setup build.bat" --grid=yami
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index 265fca8..a783d00 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -11,7 +11,7 @@
        <alert modal="true" name="FloaterNotFound">
                <message name="message">
                        Floater error: Could not find the following controls:
- 
 [CONTROLS]
                </message>
                <option name="OK">
@@ -126,7 +126,7 @@ Enter a brief description of the group&apos;s purpose.
        <alert modal="true" name="CharacterSnapshotSaved">
                <message name="message">
                        A snapshot of your character has been saved.
- 
 Visit the Webpage Studio exhibit to see it.
                </message>
        </alert>
@@ -146,8 +146,8 @@ Visit the Webpage Studio exhibit to see it.
        </alert>
        <alert modal="true" name="GrantModifyRights">
                <message name="message">
-                        Granting modify rights to another resident allows them to change 
+                        Granting modify rights to another resident allows them to change
-ANY objects you may have in-world. Be VERY careful when handing 
+ANY objects you may have in-world. Be VERY careful when handing
 out this permission.
 Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
                </message>
@@ -212,10 +212,10 @@ Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
        <alert modal="true" name="CreateGroupCanAfford">
                <message name="message">
                        Creating a group costs L$[COST].
- 
 To maintain the group for more than three days,
 you must reach a total of three or more members.
- 
 Create group?
                </message>
                <option name="Create">
@@ -275,16 +275,16 @@ Are you sure you want to continue?
        </alert>
        <alert modal="true" name="AssignDangerousActionWarning">
                <message name="message">
-                        You are about to add the Ability &apos;[ACTION_NAME]&apos; to the 
+                        You are about to add the Ability &apos;[ACTION_NAME]&apos; to the
 Role &apos;[ROLE_NAME]&apos;.
- 
 *WARNING*
 Any Member in a Role with this Ability can assign themselves--
 and any other member--to Roles that have more powers than they
 currently have, potentially elevating themselves to
 near-Owner power. Be sure you know what you&apos;re doing before
 assigning this Ability.
- 
 Add this Ability to &apos;[ROLE_NAME]&apos;?
                </message>
                <option name="Yes">
@@ -296,14 +296,14 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
        </alert>
        <alert modal="true" name="AssignDangerousAbilityWarning">
                <message name="message">
-                        You are about to add the Ability &apos;[ACTION_NAME]&apos; to the 
+                        You are about to add the Ability &apos;[ACTION_NAME]&apos; to the
 Role &apos;[ROLE_NAME]&apos;.
- 
 *WARNING*
 Any Member in a Role with this Ability can assign themselves--
 and any other member--all Abilities, elevating themselves
 to near-Owner power.
- 
 Add this Ability to &apos;[ROLE_NAME]&apos;?
                </message>
                <option name="Yes">
@@ -364,7 +364,7 @@ Go to the Second Life web site for more information on partnering?
                        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.
- 
 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.
                </message>
@@ -373,7 +373,7 @@ Residents can visit the URL you specify when they view your profile.
                <message name="message">
                        If this resident has a web profile URL set then you can:
 * Click Open to view externally in your default web browser.
- 
 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.
                </message>
@@ -478,7 +478,7 @@ Please select an individual to sell to if selling for L$0.
                <message name="message">
                        The selected [LAND_SIZE] sq. m. land is being set for sale.
 Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
- 
 Would you like to continue making this change?
                </message>
                <option name="Continue">
@@ -493,10 +493,10 @@ Would you like to continue making this change?
                        Are you sure you want to return all objects shared with
 the group &apos;[NAME]&apos; on this parcel of land
 back to their previous owner&apos;s inventory?
- 
 *WARNING* This will delete the non-transferable objects
 deeded to the group!
- 
 Objects: [N]
                </message>
                <option name="Return">
@@ -511,7 +511,7 @@ Objects: [N]
                        Are you sure you want to return all objects owned by the
 resident &apos;[NAME]&apos; on this parcel of land
 back to their inventory?
- 
 Objects: [N]
                </message>
                <option name="Return">
@@ -526,7 +526,7 @@ Objects: [N]
                        Are you sure you want to return all objects
 owned by you on this parcel of land back to
 your inventory?
- 
 Objects: [N]
                </message>
                <option name="Return">
@@ -542,10 +542,10 @@ Objects: [N]
 by you on this parcel of land back to their owner&apos;s inventory?
 Transferable objects deeded to a group will be
 returned to their previous owners.
- 
 *WARNING* This will delete the non-transferable objects
 deeded to the group!
- 
 Objects: [N]
                </message>
                <option name="Return">
@@ -561,10 +561,10 @@ Objects: [N]
 by [NAME] on this parcel of land back to their owner&apos;s inventory?
 Transferable objects deeded to a group will be
 returned to their previous owners.
- 
 *WARNING* This will delete the non-transferable objects
 deeded to the group!
- 
 Objects: [N]
                </message>
                <option name="Return">
@@ -602,7 +602,7 @@ in this region back to their owner&apos;s inventory?
                        Return the objects on this parcel of land
 that are NOT shared with the group [NAME]
 back to their owners?
- 
 Objects: [N]
                </message>
                <option name="Return">
@@ -690,7 +690,7 @@ The outfit folder contains no clothing, body parts, or attachments.
        <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 a new account?
                </message>
                <option name="OK">
@@ -704,10 +704,10 @@ Go to www.secondlife.com to create a new account?
                <message name="message">
                        Classified ads appear in the &apos;Classified&apos; section of the
 Search directory for one week.
- 
 Fill out your ad, then click &apos;Publish...&apos; to add it to the
 directory.
- 
 You&apos;ll be asked for a price to pay when clicking Publish.
 Paying more makes your ad appear higher in the list, and
 also appear higher when people search for keywords.
@@ -750,7 +750,7 @@ There is no reimbursement for fees paid.
                        Some of the display changes that you have made
 require [SECOND_LIFE] to shut down immediately,
 which will cause you to lose any work in progress.
- 
 Apply those changes and quit
                </message>
                <option name="ApplyandQuit">
@@ -960,15 +960,6 @@ based on your system configuration.
                        OK
                </option>
        </alert>
-        <alert modal="true" name="DisplaySettingsNoShaders">
-                <message name="message">
-                        [SECOND_LIFE] crashed while initializing graphics drivers.
-Shaders will be disabled in order to avoid some common driver errors.
-This will disable some graphics features.
-We recommend updating your graphics card drivers.
-Shaders can be re-enabled in Preferences &gt; Graphics Detail.
-                </message>
-        </alert>
        <alert modal="true" name="CannotRequestDomain">
                <message name="message">
                        Unable to connect to server.
@@ -980,7 +971,7 @@ Could not request domain name: [HOST]
                        Unable to find the server domain name.
 This could be the result of a lost network connection
 or a server problem.
- 
 Please try again in a few minutes, or click Help
 for advice and a link to the system status web page.
                </message>
@@ -1012,7 +1003,7 @@ please go to the support section and report this problem.
 Often this means that your computer&apos;s clock is set incorrectly.
 Please go to Control Panels and make sure the time and date
 are set correctly.
- 
 If you continue to receive this error, please go
 to the Support section of the SecondLife.com web site
 and report the problem.
@@ -1060,7 +1051,7 @@ SecondLife.com web site.
                <message name="message">
                        Unknown problem trying to connect.
 (Blank error message from server.)
- 
 Please try again in a few minutes, or click Help
 for advice and a link to the system status web page.
                </message>
@@ -1074,7 +1065,7 @@ for advice and a link to the system status web page.
        <alert modal="true" name="CannotConnectNoReplyFromLogin">
                <message name="message">
                        Unable to connect.  No reply from login database.
- 
 Please try again in a few minutes, or click Help
 for advice and a link to the system status web page.
                </message>
@@ -1093,10 +1084,10 @@ for advice and a link to the system status web page.
        <alert modal="true" name="FirstRunDialog">
                <message name="message">
                        [SECOND_LIFE] installation is complete.
- 
 If this is your first time using [SECOND_LIFE], you will need to create
 an account before you can log on.
- 
 Return to www.secondlife.com to create a new account?
                </message>
                <option name="NewAccount...">
@@ -1124,7 +1115,7 @@ Please check your network connection.
                <message name="message">
                        Unable to connect.  Login packet never received by
 login server.
- 
 Please try again in a few minutes, or click Help
 for advice and a link to the system status web page.
                </message>
@@ -1137,11 +1128,11 @@ for advice and a link to the system status web page.
        </alert>
        <alert modal="true" name="WelcomeToSecondLife">
                <message name="message">
-                        Welcome to [SECOND_LIFE]! 
+                        Welcome to [SECOND_LIFE]!
- 
 Use arrow keys to walk.
- 
-Please choose the male or female character. 
+Please choose the male or female character.
 You can change your mind later.
                </message>
                <option name="Male">
@@ -1153,10 +1144,10 @@ You can change your mind later.
        </alert>
        <alert modal="true" name="WelcomeToSecondLifeSimple">
                <message name="message">
-                        Welcome to [SECOND_LIFE]! 
+                        Welcome to [SECOND_LIFE]!
- 
 Use arrow keys to walk.
- 
 Please choose the male or female character.
                </message>
                <option name="Male">
@@ -1287,7 +1278,7 @@ same region.
        <alert modal="true" name="TakeLockedOrNotOwnedBy">
                <message name="message">
                        At least one object is locked or not owned by you.
-If an object is not owned by you and you take it, 
+If an object is not owned by you and you take it,
 next owner permissions will be applied to it and
 possibly restrict your ability to modify or copy it
 in the future.
@@ -1304,8 +1295,8 @@ Are you sure you want to take these itmes?
        <alert modal="true" name="PromptGoToCurrencyPage">
                <message name="message">
                        [EXTRA]
- 
- 
 Go to [URL] for information on purchasing currency?
                </message>
                <option name="GotoPage">
@@ -1364,50 +1355,50 @@ Expected [VALIDS]
        </alert>
        <alert modal="true" name="SoundFileNotRIFF">
                <message name="message">
-                        File does not appear to be a RIFF WAVE file: 
+                        File does not appear to be a RIFF WAVE file:
 [FILE]
                </message>
        </alert>
        <alert modal="true" name="SoundFileNotPCM">
                <message name="message">
-                        File does not appear to be a PCM WAVE audio file: 
+                        File does not appear to be a PCM WAVE audio file:
 [FILE]
                </message>
        </alert>
        <alert modal="true" name="SoundFileInvalidChannelCount">
                <message name="message">
-                        File has invalid number of channels (must be mono or stereo): 
+                        File has invalid number of channels (must be mono or stereo):
 [FILE]
                </message>
        </alert>
        <alert modal="true" name="SoundFileInvalidSampleRate">
                <message name="message">
-                        File does not appear to be a supported sample rate (must be 44.1k): 
+                        File does not appear to be a supported sample rate (must be 44.1k):
 [FILE]
                </message>
        </alert>
        <alert modal="true" name="SoundFileInvalidWordSize">
                <message name="message">
-                        File does not appear to be a supported word size (must be 8 or 16 bit): 
+                        File does not appear to be a supported word size (must be 8 or 16 bit):
 [FILE]
                </message>
        </alert>
        <alert modal="true" name="SoundFileInvalidHeader">
                <message name="message">
-                        Could not find &apos;data&apos; chunk in WAV header: 
+                        Could not find &apos;data&apos; chunk in WAV header:
 [FILE]
                </message>
        </alert>
        <alert modal="true" name="SoundFileInvalidTooLong">
                <message name="message">
-                        Audio file is too long (10 second maximum): 
+                        Audio file is too long (10 second maximum):
 [FILE]
                </message>
        </alert>
        <alert modal="true" name="ProblemWithFile">
                <message name="message">
                        Problem with file [FILE]:
- 
 [ERROR]
                </message>
        </alert>
@@ -1679,11 +1670,11 @@ Try selecting a smaller area.
        </alert>
        <alert modal="true" name="ParcelCanPlayMusic">
                <message name="message">
-                        This location can play streaming music. 
+                        This location can play streaming music.
- 
 Music requires a 768 kbps or faster
 Internet connection.
- 
 Play music when available?
                </message>
                <option name="PlayMusic">
@@ -1695,14 +1686,14 @@ Play music when available?
        </alert>
        <alert modal="true" name="ParcelCanPlayMedia">
                <message name="message">
-                        This location can play streaming video. 
+                        This location can play streaming video.
- 
-Streaming video requires a 768 kbps or 
+Streaming video requires a 768 kbps or
 faster Internet connection.
- 
 Play streaming video when available?
- 
-(You can change this option later under 
+(You can change this option later under
 Preferences &gt; Audio &amp; Video.)
                </message>
                <option name="PlayMedia">
@@ -1815,7 +1806,7 @@ The region [REGION] does not allow transfer of land.
                <message name="message">
                        Unable to abandon land:
 You must select an entire parcel to release it.
-Try double-clicking to select an entire parcel, or 
+Try double-clicking to select an entire parcel, or
 first divide your parcel.
                </message>
        </alert>
@@ -1824,7 +1815,7 @@ first divide your parcel.
                        You are about to release [AREA] sq. meters of land.
 Releasing this parcel will remove it from your land
 holdings, but will not credit any L$.
- 
 Release this land?
                </message>
                <option name="Release">
@@ -1853,7 +1844,7 @@ and dragging.
                        Dividing this land will split this parcel into two
 and each parcel can have its own settings. Some settings
 will be reset to defaults after the operation.
- 
 Divide land?
                </message>
                <option name="Divide">
@@ -1901,12 +1892,12 @@ and dragging.
        </alert>
        <alert modal="true" name="JoinLandWarning">
                <message name="message">
-                        Joining this land will create one large parcel 
+                        Joining this land will create one large parcel
-out of all parcels intersecting the selected rectangle. 
+out of all parcels intersecting the selected rectangle.
- 
-You will need to reset the name and options of the 
+You will need to reset the name and options of the
-new parcel. 
+new parcel.
- 
 Join land?
                </message>
                <option name="Join">
@@ -1984,7 +1975,7 @@ and provide details about your network setup.
        <alert modal="true" name="AppEarlyExit">
                <message name="message">
                        [MESSAGE]
- 
 We are unable to recover from this problem. Please
 uninstall and reinstall before trying again. If this
 problem persists, check the Tech Support FAQ at:
@@ -1997,9 +1988,9 @@ www.secondlife.com/support.
        <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.
@@ -2020,10 +2011,10 @@ Please activate another group using Edit -&gt; Groups...
        </alert>
        <alert model="true" name="AddFriend" title="Add Friend">
                <message name="message">
-                        Friends can give permissions to 
+                        Friends can give permissions to
-track each other on the map and 
+track each other on the map and
-receive online status updates. 
+receive online status updates.
- 
 Offer friendship to [NAME]?
                </message>
                <option name="Offer">
@@ -2058,9 +2049,9 @@ Offer friendship to [NAME]?
        <alert modal="true" name="GodDeleteAllScriptedPublicObjectsByUser">
                <message name="message">
                        Are you sure you want to delete all scripted objects owned by
- 
 ** [AVATAR_NAME] **
- 
 on all others land in this sim?
                </message>
                <option name="DELETE!!">
@@ -2073,9 +2064,9 @@ on all others land in this sim?
        <alert modal="true" name="GodDeleteAllScriptedObjectsByUser">
                <message name="message">
                        Are you sure you want to DELETE ALL scripted objects owned by
- 
 ** [AVATAR_NAME] **
- 
 on ALL LAND in this sim?
                </message>
                <option name="!!DELETEALL!!">
@@ -2089,9 +2080,9 @@ on ALL LAND in this sim?
                <message name="message">
                        Are you sure you want to DELETE ALL objects (scripted or not)
 owned by
- 
 ** [AVATAR_NAME] **
- 
 on ALL LAND in this sim?
                </message>
                <option name="!!DELETEALL!!">
@@ -2104,7 +2095,7 @@ on ALL LAND in this sim?
        <alert modal="true" name="PublishGroupInfoToWeb">
                <message name="message">
                        Selecting the &quot;Publish on the Web&quot; option allows us to publish
-the group name, insignia, charter, titles, and founder on the 
+the group name, insignia, charter, titles, and founder on the
 [SECOND_LIFE] website. You are responsible for indicating if any
 of the above content is considered Mature according to the
 Community Standards.
@@ -2123,7 +2114,7 @@ Community Standards.
        <alert modal="true" name="MinClassifiedPrice">
                <message name="message">
                        Price to pay for listing must be at least L$[MIN_PRICE].
- 
 Please enter a higher price.
                </message>
        </alert>
@@ -2284,11 +2275,11 @@ Please select a smaller area and try again.
                <message name="message">
                        By deeding this parcel, the group will be required
 to have and maintain sufficient land use credits.
- 
 The purchase price of the land is not refunded to
 the owner. If a deeded parcel is sold, the sale
 price will be divided evenly among group members.
- 
 Deed this [AREA] square meters of land to the group
 &apos;[GROUP_NAME]&apos;?
                </message>
@@ -2303,14 +2294,14 @@ Deed this [AREA] square meters of land to the group
                <message name="message">
                        By deeding this parcel, the group will be required
 to have and maintain sufficient land use credits.
- 
 The deed will include a simultaneous land
 contribution to the group from &apos;[FIRST_NAME] [LAST_NAME]&apos;.
- 
 The purchase price of the land is not refunded to
 the owner. If a deeded parcel is sold, the sale
 price will be divided evenly among group members.
- 
 Deed this [AREA] square meters of land to the group
 &apos;[GROUP_NAME]&apos;?
                </message>
@@ -2344,7 +2335,7 @@ Could not request domain name: [HOST_NAME]
                        Unable to find the server domain name.
 This could be the result of a lost network connection
 or a server problem.
- 
 Please try again in a few minutes, or click Help
 for advice and a link to the system status web page.
                </message>
@@ -2383,7 +2374,7 @@ for advice and a link to the system status web page.
        <alert modal="true" name="AvatarMoved">
                <message name="message">
                        Your [TYPE] location is not currently available.
-[HELP] 
+[HELP]
 You have been moved into a nearby region.
                </message>
        </alert>
@@ -2397,10 +2388,10 @@ will see you correctly.
        <alert modal="true" name="FirstRun">
                <message name="message">
                        [SECOND_LIFE] installation is complete.
- 
 If this is your first time using [SECOND_LIFE], you will need to create
 an account before you can log on.
- 
 Return to www.secondlife.com to create a new account?
                </message>
                <option name="NewAccount...">
@@ -2421,7 +2412,7 @@ Please check your network connection.
                <message name="message">
                        Unable to connect.  Login packet never received by
 login server.
- 
 Please try again in a few minutes, or click Help
 for advice and a link to the system status web page.
                </message>
@@ -2435,9 +2426,9 @@ for advice and a link to the system status web page.
        <alert modal="true" name="WelcomeNoClothes">
                <message name="message">
                        Your character will appear in a moment.
- 
 Use arrow keys to walk.
- 
 Press the F1 key at any time for help or
 to learn more about [SECOND_LIFE].
                </message>
@@ -2445,12 +2436,12 @@ to learn more about [SECOND_LIFE].
        <alert modal="true" name="WelcomeChooseSex" nodefault="true">
                <message name="message">
                        Your character will appear in a moment.
- 
 Use arrow keys to walk.
- 
 Press the F1 key at any time for help or
-to learn more about [SECOND_LIFE]. 
+to learn more about [SECOND_LIFE].
- 
 Please choose the male or female character.
 You can change your mind later.
                </message>
@@ -2479,10 +2470,10 @@ You can change your mind later.
        <alert modal="true" name="FlushMapVisibilityCaches">
                <message name="message">
                        This will flush the map caches on this region.
- 
-This is really only useful for debugging. 
+This is really only useful for debugging.
- 
-(In production, wait 5 minutes, then everyone&apos;s map will 
+(In production, wait 5 minutes, then everyone&apos;s map will
 update after they relog.)
                </message>
                <option name="OK">
@@ -2543,34 +2534,34 @@ non ALL LAND in this region?
        </alert>
        <alert modal="true" name="InvalidTerrainBitDepth">
                <message name="message">
-                        Couldn&apos;t set region textures: 
+                        Couldn&apos;t set region textures:
- 
 Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].
- 
 Replace texture [TEXTURE_NUM] with a 24 bit 512x512 or smaller image
 then click &quot;Set&quot; again.
                </message>
        </alert>
        <alert modal="true" name="InvalidTerrainSize">
                <message name="message">
-                        Couldn&apos;t set region textures: 
+                        Couldn&apos;t set region textures:
- 
-Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. 
+Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
- 
 Replace texture [TEXTURE_NUM] with a 24 bit 512x512 or smaller image
 then click &quot;Set&quot; again.
                </message>
        </alert>
        <alert modal="true" name="RawUploadStarted">
                <message name="message">
-                        Upload started. It may take up to two minutes, 
+                        Upload started. It may take up to two minutes,
 depending on your connection speed.
                </message>
        </alert>
        <alert modal="true" name="ConfirmBakeTerrain">
                <message name="message">
-                        Do you really want to bake the current terrain, 
+                        Do you really want to bake the current terrain,
-make it the center for terrain raise/lower limits 
+make it the center for terrain raise/lower limits
 and the default for the &apos;Revert&apos; tool?
                </message>
                <option name="Bake">
@@ -2618,19 +2609,19 @@ and the default for the &apos;Revert&apos; tool?
        </alert>
        <alert modal="true" name="ClassifiedMustBeAlphanumeric">
                <message name="message">
-                        The name of your classified must start with a letter 
+                        The name of your classified must start with a letter
 from A to Z or a number.  No punctuation is allowed.
                </message>
        </alert>
        <alert modal="true" name="CantSetBuyObject">
                <message name="message">
-                        Can&apos;t set Buy Object, because the object is not for sale. 
+                        Can&apos;t set Buy Object, because the object is not for sale.
 Please set the object for sale and try again.
                </message>
        </alert>
        <alert modal="true" name="FinishedRawDownload">
                <message name="message">
-                        Finished download of raw terrain file to: 
+                        Finished download of raw terrain file to:
 [DOWNLOAD_PATH]
                </message>
        </alert>
@@ -2638,7 +2629,7 @@ Please set the object for sale and try again.
                <message name="message">
                        A new version of [SECOND_LIFE] is available.
 [MESSAGE]
- 
 You must download this update to use the system.
                </message>
                <option name="Download">
@@ -2652,7 +2643,7 @@ You must download this update to use the system.
                <message name="message">
                        An updated version of [SECOND_LIFE] is available.
 [MESSAGE]
- 
 This update is not required, but we suggest you install it to improve performance and stability.
                </message>
                <option name="Download">
@@ -2666,7 +2657,7 @@ This update is not required, but we suggest you install it to improve performanc
                <message name="message">
                        An updated version of [SECOND_LIFE] is available.
 [MESSAGE]
- 
 This update is not required, but we suggest you install it to improve performance and stability.
                </message>
                <option name="Download">
@@ -2682,7 +2673,7 @@ This update is not required, but we suggest you install it to improve performanc
 [MESSAGE]
 You must download this update to use the system.
- 
 Download to your Applications folder?
                </message>
                <option name="Download">
@@ -2696,9 +2687,9 @@ Download to your Applications folder?
                <message name="message">
                        An updated version of [SECOND_LIFE] is available.
 [MESSAGE]
- 
 This update is not required, but we suggest you install it to improve performance and stability.
- 
 Download to your Applications folder?
                </message>
                <option name="Download">
@@ -2712,9 +2703,9 @@ Download to your Applications folder?
                <message name="message">
                        An updated version of [SECOND_LIFE] is available.
 [MESSAGE]
- 
 This update is not required, but we suggest you install it to improve performance and stability.
- 
 Download to your Applications folder?
                </message>
                <option name="Download">
@@ -2743,10 +2734,10 @@ Download to your Applications folder?
                <message name="message">
                        Classified ads appear in the &apos;Classified&apos; section of the
 Find directory for one week.
- 
 Fill out your ad, then click &apos;Publish...&apos; to add it to the
 directory.
- 
 You&apos;ll be asked for a price to pay when clicking Publish.
 Paying more makes your ad appear higher in the list, and
 also appear higher when people search for keywords.
@@ -2775,6 +2766,62 @@ also appear higher when people search for keywords.
                        Cancel
                </option>
        </alert>
+        <alert modal="true" name="WebLaunchBugReport101">
+                <message name="message">
+                        Visit the [SECOND_LIFE] Wiki and Learn how to Report Bugs Correctly.
+                </message>
+                <ignore>
+                        When launching web browser to view the Bug Reporting 101 Wiki
+                </ignore>
+                <option name="Gotopage">
+                        Go to page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchSecurityIssues">
+                <message name="message">
+                        Visit the [SECOND_LIFE] Wiki for Details of How to Report a Security Issue.
+                </message>
+                <ignore>
+                        When launching web browser to view Security Issues Wiki
+                </ignore>
+                <option name="Gotopage">
+                        Go to page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchPublicIssue">
+                <message name="message">
+                        Visit the [SECOND_LIFE] Public Issue Tracker, Where you can Report Bugs and other Issues.
+                </message>
+                <ignore>
+                        When launching web browser to view the Public Issue Tracker
+                </ignore>
+                <option name="Gotopage">
+                        Go to page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchPublicIssueHelp">
+                <message name="message">
+                        Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
+                </message>
+                <ignore>
+                        When launching web browser to view Public Issue Tracker Wiki
+                </ignore>
+                <option name="Gotopage">
+                        Go to page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
        <alert modal="true" name="WebLaunchForums">
                <message name="message">
                        Search the [SECOND_LIFE] Knowledge Base for the latest tips and tricks.
@@ -2865,7 +2912,7 @@ also appear higher when people search for keywords.
 objects to their owners? Transferable deeded
 objects will be returned to their previous owners.
 (All objects returned will return to the folder they were last in.)
- 
 *WARNING* No-transfer deeded objects will be deleted!
                </message>
                <ignore>
@@ -2931,7 +2978,7 @@ Leave Group?
        </alert>
        <alert modal="true" name="MuteByName" title="Mute object by name">
                <message name="message">
-                        Mute by name only affects object chat and IM, not sounds. 
+                        Mute by name only affects object chat and IM, not sounds.
 You must type the object&apos;s name exactly.
                </message>
                <editline>
@@ -3173,13 +3220,13 @@ sent to everyone currently in your estate.
        </alert>
        <alert name="ChangeLindenEstate" title="Change Linden Estate">
                <message name="message">
-                        You are about to change a Linden owned estate (mainland, 
+                        You are about to change a Linden owned estate (mainland,
-teen grid, orientation, etc.). 
+teen grid, orientation, etc.).
- 
-This is EXTREMELY DANGEROUS because it can fundamentally 
+This is EXTREMELY DANGEROUS because it can fundamentally
-affect the user experience.  On the mainland, it will change 
+affect the user experience.  On the mainland, it will change
 thousands of regions and make the spaceserver hiccup.
- 
 Proceed?
                </message>
                <option name="ChangeEstate">
@@ -3191,16 +3238,16 @@ Proceed?
        </alert>
        <alert name="ChangeLindenAccess" title="Change Linden Estate Access">
                <message name="message">
-                        You are about to change the access list for a Linden owned 
+                        You are about to change the access list for a Linden owned
-estate (mainland, teen grid, orientation, etc.). 
+estate (mainland, teen grid, orientation, etc.).
- 
-This is DANGEROUS and should only be done to invoke the 
+This is DANGEROUS and should only be done to invoke the
-hack allowing objects/money to be transfered in/out of 
+hack allowing objects/money to be transfered in/out of
-a grid. 
+a grid.
- 
-It will change thousands of regions and make the 
+It will change thousands of regions and make the
-spaceserver hiccup. 
+spaceserver hiccup.
- 
 Proceed?
                </message>
                <option name="ChangeEstate">
@@ -3393,7 +3440,7 @@ Proceed?
        <alert name="PublishClassified">
                <message name="message">
                        Remember: Classified ad fees are non-refundable.
- 
 Publish this classified now for L$[AMOUNT]?
                </message>
                <option name="Publish">
@@ -3431,7 +3478,7 @@ sent to everyone in this region.
                <message name="message">
                        If this box is checked, land owners will not be able to terraform
 their land regardless of the per-parcel &apos;Edit Terrain&apos; setting.
- 
 Default: off
                </message>
        </alert>
@@ -3439,7 +3486,7 @@ Default: off
                <message name="message">
                        If this box is checked, people will not be able to fly in this region
 regardless of the per-parcel &apos;Fly&apos; setting.
- 
 Default: off
                </message>
        </alert>
@@ -3447,18 +3494,18 @@ Default: off
                <message name="message">
                        Checking this box enables the health system across all parcels
 regardless of individual parcel settings. If this box is left
-unchecked, individual parcel owners will still be able to 
+unchecked, individual parcel owners will still be able to
 activate the health system on their parcels.
- 
 Default: off
                </message>
        </alert>
        <alert modal="true" name="HelpRegionAgentLimit" title="Agent Limit">
                <message name="message">
                        Sets the maximum number of avatars allowed in this region.
-Note that the more avatars you have in one region, the worse 
+Note that the more avatars you have in one region, the worse
 the performance can be.
- 
 Default: 30
                </message>
        </alert>
@@ -3472,7 +3519,7 @@ allowed per region remains 15,000 no matter what the value set for
 Object Bonus. Once this value is set, it should not be lowered until
 you are certain that changing it will not force return or deletion of
 the objects currently on parcels.
- 
 Default: 1.0
                </message>
        </alert>
@@ -3482,10 +3529,10 @@ Default: 1.0
 corner of the screen and in pop-up tips on the map.  Maturity
 also affects search results - residents can choose not to find
 content in Mature regions.
- 
-The pop-up tips on the map will not change for 5 minutes, because 
+The pop-up tips on the map will not change for 5 minutes, because
-the system only updates map information periodically. 
+the system only updates map information periodically.
- 
 Default: PG
                </message>
        </alert>
@@ -3496,49 +3543,49 @@ Agents may only push themselves, or be pushed by scripts owned by
 the owner of a parcel, or that are set to the group of the parcel,
 assuming the parcel has a group set/deeded.
 Push refers to the llPushObject() LSL function.
- 
 Default: Off
                </message>
        </alert>
        <alert modal="true" name="HelpParcelChanges" title="Parcel Join/Subdivide">
                <message name="message">
                        Sets whether or not parcels not owned by the estate owner
-can be joined or subdivided. 
+can be joined or subdivided.
 If this option is unchecked:
- * Only estate owners or managers can join or subdivide parcels. 
+ * Only estate owners or managers can join or subdivide parcels.
- * They may only join or subdivide parcels belonging to the owner, 
+ * They may only join or subdivide parcels belonging to the owner,
       or to a group where they have the appropriate group powers.
 If this option is checked:
- * All parcel owners can join or subdivide the parcels they own. 
+ * All parcel owners can join or subdivide the parcels they own.
 * For group owned parcels, those with appropriate group powers
       may join or subdivide parcels.
- 
 Default: Checked
                </message>
        </alert>
        <alert modal="true" name="RegionMaturityChange" title="Changed Region Maturity">
                <message name="message">
-                        The maturity rating for this region has been updated. 
+                        The maturity rating for this region has been updated.
- 
-The world map, however, will take approximately 5 minutes 
+The world map, however, will take approximately 5 minutes
-to update, because the system only updates map information 
+to update, because the system only updates map information
 periodically.
                </message>
        </alert>
        <alert modal="true" name="HelpRegionLandResell" title="Land Resale">
                <message name="message">
-                        Estate owners and managers can sell any land owned by the estate owner. 
+                        Estate owners and managers can sell any land owned by the estate owner.
-If this option is left unchecked, buyers cannot resell their land in this region. 
+If this option is left unchecked, buyers cannot resell their land in this region.
-If this option is checked, buyers can resell their land in this region. 
+If this option is checked, buyers can resell their land in this region.
- 
 Default: Disallow
                </message>
        </alert>
        <alert modal="true" name="HelpEstateCovenantID" title="Covenant Asset ID">
                <message name="message">
                        Sets the notecard asset ID for the Estate Covenant belonging to this
-estate. 
+estate.
- 
 Default: 00000000-0000-0000-0000-000000000000 or none
                </message>
        </alert>
@@ -3546,200 +3593,200 @@ Default: 00000000-0000-0000-0000-000000000000 or none
                <message name="message">
                        When sim performance is poor, a script may be to blame. Open the
 Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS.
-If it is lower than 45 then open the &apos;Time&apos; panel located at the 
+If it is lower than 45 then open the &apos;Time&apos; panel located at the
-bottom of the Stats Bar. If Script Time reads 25 ms or higher, click 
+bottom of the Stats Bar. If Script Time reads 25 ms or higher, click
-the &apos;Get Top Scripts&apos; button. You will be given the name and location 
+the &apos;Get Top Scripts&apos; button. You will be given the name and location
 of scripts that may be causing poor performance.
- 
-Checking the &apos;Disable Scripts&apos; box and then pressing the &apos;Apply&apos; 
+Checking the &apos;Disable Scripts&apos; box and then pressing the &apos;Apply&apos;
-button will temporarily disable all scripts in this region. You may 
+button will temporarily disable all scripts in this region. You may
-need to do this in order to travel to the location of a noted 
+need to do this in order to travel to the location of a noted
-&apos;top script&apos;. Once you have arrived at the location, investigate the 
+&apos;top script&apos;. Once you have arrived at the location, investigate the
-script to determine if it is causing the problem. You may want to 
+script to determine if it is causing the problem. You may want to
-contact the owner of the script or delete or return the object. 
+contact the owner of the script or delete or return the object.
-Uncheck the &apos;Disable Script&apos; box and then &apos;Apply&apos; to reactivate 
+Uncheck the &apos;Disable Script&apos; box and then &apos;Apply&apos; to reactivate
 the scripts in the region.
- 
 Default: off
                </message>
        </alert>
        <alert modal="true" name="HelpRegionDisableCollisions" title="Disable Collisions">
                <message name="message">
-                        When sim performance is poor, physical objects may be to blame. 
+                        When sim performance is poor, physical objects may be to blame.
-Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator 
+Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator
-Physics FPS.  If it is lower than 45 then open the &apos;Time&apos; panel 
+Physics FPS.  If it is lower than 45 then open the &apos;Time&apos; panel
-located at the bottom of the Stats Bar. If Sim Time (Physics) 
+located at the bottom of the Stats Bar. If Sim Time (Physics)
-reads 20 ms or higher, click the &apos;Get Top Colliders&apos; button. 
+reads 20 ms or higher, click the &apos;Get Top Colliders&apos; button.
-You will be given the name and location of physical objects 
+You will be given the name and location of physical objects
 that may be causing poor performance.
- 
-Checking the &apos;Disable Collisions&apos; box and then pressing the &apos;Apply&apos; 
+Checking the &apos;Disable Collisions&apos; box and then pressing the &apos;Apply&apos;
-button will temporarily disable object-object collisions. You may 
+button will temporarily disable object-object collisions. You may
-need to do this in order to travel to the location of a noted 
+need to do this in order to travel to the location of a noted
-&apos;top collider&apos;. Once you have arrived at the location, investigate the 
+&apos;top collider&apos;. Once you have arrived at the location, investigate the
-object - is it constantly colliding with other objects? You may want to 
+object - is it constantly colliding with other objects? You may want to
-contact the owner of the object or delete or return the object. 
+contact the owner of the object or delete or return the object.
-Uncheck the &apos;Disable Collisions&apos; box and then &apos;Apply&apos; to reactivate 
+Uncheck the &apos;Disable Collisions&apos; box and then &apos;Apply&apos; to reactivate
 collisions in the region.
- 
 Default: off
                </message>
        </alert>
        <alert modal="true" name="HelpRegionDisablePhysics" title="Disable Physics">
                <message name="message">
-                        Disable Physics is similar to Disable Collisions, except all 
+                        Disable Physics is similar to Disable Collisions, except all
-physics simulation is disabled.  This means that not only will 
+physics simulation is disabled.  This means that not only will
-objects stop colliding, but avatars will be unable to move. 
+objects stop colliding, but avatars will be unable to move.
- 
-This should only be used when Disable Collisions does not 
+This should only be used when Disable Collisions does not
-give back enough performance to the region to investigate 
+give back enough performance to the region to investigate
 a physics problem or &apos;Top Collider&apos;.
- 
-Be sure to re-enable physics when you are done, or avatars 
+Be sure to re-enable physics when you are done, or avatars
-will continue to be unable to move. 
+will continue to be unable to move.
- 
 Default: off
                </message>
        </alert>
        <alert modal="true" name="HelpRegionTopColliders" title="Top Colliders">
                <message name="message">
-                        Show a list of objects experiencing the greatest number 
+                        Show a list of objects experiencing the greatest number
-of potential object-object collisions.  These objects can 
+of potential object-object collisions.  These objects can
-slow sim performance.  Select View &gt; Statistics Bar and 
+slow sim performance.  Select View &gt; Statistics Bar and
-look under Simulator &gt; Time &gt; Sim Time (Physics) to see 
+look under Simulator &gt; Time &gt; Sim Time (Physics) to see
 if more than 20 ms is being spent in physics.
                </message>
        </alert>
        <alert modal="true" name="HelpRegionTopScripts" title="Top Scripts">
                <message name="message">
-                        Show a list of objects spending the most time running 
+                        Show a list of objects spending the most time running
-LSL scripts.  These objects can slow sim performance. 
+LSL scripts.  These objects can slow sim performance.
-Select View &gt; Statistics Bar and look under 
+Select View &gt; Statistics Bar and look under
-Simulator &gt; Time &gt; Script Time to see if more than 
+Simulator &gt; Time &gt; Script Time to see if more than
 25 ms is being spent in scripts.
                </message>
        </alert>
        <alert modal="true" name="HelpRegionRestart" title="Restart Region">
                <message name="message">
-                        Restart the server process running this region after a 
+                        Restart the server process running this region after a
-two minute warning.  All residents in the region will be 
+two minute warning.  All residents in the region will be
-disconnected.  The region will save its data, and should 
+disconnected.  The region will save its data, and should
-come back up within 90 seconds. 
+come back up within 90 seconds.
- 
-Restarting the region will not fix most performance 
+Restarting the region will not fix most performance
 problems, and should usually be used only when directed.
                </message>
        </alert>
        <alert modal="true" name="HelpRegionWaterHeight" title="Water Height">
                <message name="message">
-                        This is the height in meters where water appears. If 
+                        This is the height in meters where water appears. If
-this setting is anything other than 20 and you have 
+this setting is anything other than 20 and you have
-water that is adjacent to the edge of world or &apos;void&apos; 
+water that is adjacent to the edge of world or &apos;void&apos;
-water, there will be a visible gap. 
+water, there will be a visible gap.
- 
 Default: 20
                </message>
        </alert>
        <alert modal="true" name="HelpRegionTerrainRaise" title="Terrain Raise">
                <message name="message">
-                        This is the distance that parcel owners can raise 
+                        This is the distance that parcel owners can raise
-their terrain above the &apos;baked&apos; terrain default 
+their terrain above the &apos;baked&apos; terrain default
-height. 
+height.
- 
 Default: 4
                </message>
        </alert>
        <alert modal="true" name="HelpRegionTerrainLower" title="Terrain Lower">
                <message name="message">
-                        This is the distance that parcel owners can lower 
+                        This is the distance that parcel owners can lower
-their terrain below the &apos;baked&apos; terrain default 
+their terrain below the &apos;baked&apos; terrain default
-height. 
+height.
- 
 Default: -4
                </message>
        </alert>
        <alert modal="true" name="HelpRegionUploadRaw" title="Upload RAW Terrain">
                <message name="message">
-                        This button uploads a .RAW file to the region you are in. 
+                        This button uploads a .RAW file to the region you are in.
-The file must have the correct dimensions/number of channels: 
+The file must have the correct dimensions/number of channels:
-RGB, 256x256 and 13 channels.  The best way to create a 
+RGB, 256x256 and 13 channels.  The best way to create a
-terrain file is to download the existing RAW file.  A good 
+terrain file is to download the existing RAW file.  A good
-first step is to modify the first channel (land height), 
+first step is to modify the first channel (land height),
-and upload it. 
+and upload it.
- 
-The upload can take up to 45 seconds. Note that uploading a 
+The upload can take up to 45 seconds. Note that uploading a
-terrain file *will not* move the objects that are on the land, 
+terrain file *will not* move the objects that are on the land,
-only the terrain itself and the permissions associated with the 
+only the terrain itself and the permissions associated with the
-parcels.  This can result in objects going underground. 
+parcels.  This can result in objects going underground.
- 
-For more information on editing region height fields, go to: 
+For more information on editing region height fields, go to:
 http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
                </message>
        </alert>
        <alert modal="true" name="HelpRegionDownloadRaw" title="Download RAW Terrain">
                <message name="message">
-                        This button downloads a file containing the height field data, 
+                        This button downloads a file containing the height field data,
-parcel dimensions, parcel for sale status and some parcel permissions 
+parcel dimensions, parcel for sale status and some parcel permissions
-for this region. When opening the file in a program such as 
+for this region. When opening the file in a program such as
-Photoshop you must specify the document&apos;s dimensions which 
+Photoshop you must specify the document&apos;s dimensions which
-are: RGB, 256x256 with 13 channels. This terrain file cannot 
+are: RGB, 256x256 with 13 channels. This terrain file cannot
-be opened in any other way. 
+be opened in any other way.
- 
-For more information on editing region height fields, go to: 
+For more information on editing region height fields, go to:
 http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
                </message>
        </alert>
        <alert modal="true" name="HelpRegionUseEstateSun" title="Use Estate Sun">
                <message name="message">
-                        This checkbox makes the sun position in this region the 
+                        This checkbox makes the sun position in this region the
-same as the sun position in the rest of the estate. 
+same as the sun position in the rest of the estate.
- 
 Default: on
                </message>
        </alert>
        <alert modal="true" name="HelpRegionFixedSun" title="Fixed Sun">
                <message name="message">
-                        This checkbox sets the sun position to the position 
+                        This checkbox sets the sun position to the position
-in the Phase slider and stops the sun from moving. 
+in the Phase slider and stops the sun from moving.
- 
 Default: off
                </message>
        </alert>
        <alert modal="true" name="HelpRegionBakeTerrain" title="Bake Terrain">
                <message name="message">
-                        This button saves the current shape of the terrain as the 
+                        This button saves the current shape of the terrain as the
-new default for the region. Once baked, the land can revert 
+new default for the region. Once baked, the land can revert
 to the saved shape whenever you or others use the Edit Terrain
-&apos;Revert&apos; option/tool. The baked terrain is also the middle 
+&apos;Revert&apos; option/tool. The baked terrain is also the middle
 point for the terrain raise and lower limits.
                </message>
        </alert>
        <alert modal="true" name="HelpEstateEstateManager" title="Estate Managers">
                <message name="message">
-                        An estate manager is a resident to whom you have delegated 
+                        An estate manager is a resident to whom you have delegated
-control of region and estate settings.  An estate manager 
+control of region and estate settings.  An estate manager
-can change any setting in these panels, except for uploading, 
+can change any setting in these panels, except for uploading,
-downloading, and baking terrain.  In particular, they can 
+downloading, and baking terrain.  In particular, they can
-allow or ban residents from your estate.  
+allow or ban residents from your estate.
- 
-Estate managers can only be added or removed by the owner 
+Estate managers can only be added or removed by the owner
-of the estate, not by each other.  Please only choose 
+of the estate, not by each other.  Please only choose
-residents you trust as estate managers, as you will be 
+residents you trust as estate managers, as you will be
 ultimately responsible for their actions.
                </message>
        </alert>
        <alert modal="true" name="HelpEstateUseGlobalTime" title="Use Global Time">
                <message name="message">
-                        This checkbox makes the sun in your estate follow 
+                        This checkbox makes the sun in your estate follow
-the same position as on the Linden-owned &apos;mainland&apos; 
+the same position as on the Linden-owned &apos;mainland&apos;
-estates. 
+estates.
- 
 Default: on
                </message>
        </alert>
        <alert modal="true" name="HelpEstateFixedSun" title="Fixed Sun">
                <message name="message">
-                        This checkbox sets the sun position to the position 
+                        This checkbox sets the sun position to the position
 in the Phase slider and stops the sun from moving.
                </message>
        </alert>
@@ -3747,91 +3794,91 @@ in the Phase slider and stops the sun from moving.
                <message name="message">
                        Sets whether residents who are on other estates can enter this
                         estate without being on an access list.
- 
 Default: on
                </message>
        </alert>
        <alert modal="true" name="HelpEstateAllowDirectTeleport" title="Allow Direct Teleport">
                <message name="message">
-                        When checked, allows residents to directly teleport to any 
+                        When checked, allows residents to directly teleport to any
-point in your estate.  When unchecked, residents teleport 
+point in your estate.  When unchecked, residents teleport
-to the nearest telehub. 
+to the nearest telehub.
- 
 Default: off
                </message>
        </alert>
        <alert modal="true" name="HelpEstateAllowResident" title="Allow Access">
                <message name="message">
-                        If any resident is listed here, access to the estate will be 
+                        If any resident is listed here, access to the estate will be
-limited to residents on this list and groups listed below. 
+limited to residents on this list and groups listed below.
- 
-(If the estate is visible from the mainland, access cannot be 
+(If the estate is visible from the mainland, access cannot be
-limited to a resident or group list, and these controls will be 
+limited to a resident or group list, and these controls will be
 disabled.  Only the &apos;access denied&apos; list will be used.)
                </message>
        </alert>
        <alert modal="true" name="HelpEstateAllowGroup" title="Allow Group Access">
                <message name="message">
-                        If any group is listed here, access to the estate will be 
+                        If any group is listed here, access to the estate will be
-limited to the groups on this list and residents specifically 
+limited to the groups on this list and residents specifically
-allowed above. 
+allowed above.
- 
-(If the estate is visible from the mainland, access cannot be 
+(If the estate is visible from the mainland, access cannot be
-limited to a resident or group list, and these controls will be 
+limited to a resident or group list, and these controls will be
 disabled.  Only the &apos;access denied&apos; list will be used.)
                </message>
        </alert>
        <alert modal="true" name="HelpEstateBanResident" title="Deny Access">
                <message name="message">
-                        Residents on this list are denied access to your estate, 
+                        Residents on this list are denied access to your estate,
-regardless of the allow and group settings above. 
+regardless of the allow and group settings above.
- 
-Adding a resident to this list will remove them from 
+Adding a resident to this list will remove them from
 the allow list.
                </message>
        </alert>
        <alert modal="true" name="HelpEstateCovenant" title="Estate Covenant">
                <message name="message">
-                        Setting an estate covenant enables you to sell parcels 
+                        Setting an estate covenant enables you to sell parcels
-within that estate. If a covenant is not set, you cannot 
+within that estate. If a covenant is not set, you cannot
-sell the land. The notecard for your covenant can be empty 
+sell the land. The notecard for your covenant can be empty
-if you do not wish to apply any rules or advise buyers of 
+if you do not wish to apply any rules or advise buyers of
-anything in relation to the land before they buy it. 
+anything in relation to the land before they buy it.
- 
-A covenant can be used to communicate rules, guidelines, 
+A covenant can be used to communicate rules, guidelines,
-cultural information or simply your own expectations to the 
+cultural information or simply your own expectations to the
-prospective buyer. This can include zoning, building regulations, 
+prospective buyer. This can include zoning, building regulations,
-payment options or any other information you feel it is 
+payment options or any other information you feel it is
-important for the new owner to have seen and to have agreed 
+important for the new owner to have seen and to have agreed
-to before they purchase. 
+to before they purchase.
- 
-The buyer must agree to the covenant by ticking the check box 
+The buyer must agree to the covenant by ticking the check box
-before they will be able to finish the purchase. Estate 
+before they will be able to finish the purchase. Estate
-covenants are always visible in the About Land dialog for 
+covenants are always visible in the About Land dialog for
 any parcels that have one set.
                </message>
        </alert>
        <alert modal="true" name="BuyObjectOneOnly" title="Can&apos;t Buy Objects">
                <message name="message">
-                        Unable to buy more than one object at a time. 
+                        Unable to buy more than one object at a time.
 Please select only one object and try again.
                </message>
        </alert>
        <alert modal="true" name="BuyObjectOneOwner" title="Can&apos;t Buy Objects">
                <message name="message">
-                        Cannot buy objects from different owners at the same time. 
+                        Cannot buy objects from different owners at the same time.
 Please select only one object and try again.
                </message>
        </alert>
        <alert modal="true" name="BuyContentsOneOnly" title="Can&apos;t Buy Contents">
                <message name="message">
-                        Unable to buy the contents of more than one object at a time. 
+                        Unable to buy the contents of more than one object at a time.
 Please select only one object and try again.
                </message>
        </alert>
        <alert modal="true" name="BuyContentsOneOwner" title="Can&apos;t Buy Contents">
                <message name="message">
-                        Cannot buy objects from different owners at the same time. 
+                        Cannot buy objects from different owners at the same time.
 Please select only one object and try again.
                </message>
        </alert>
@@ -3936,9 +3983,9 @@ They will be copied to your inventory.
        <alert modal="true" name="ConfirmPurchase" nodefault="true">
                <message name="message">
                        This transaction will:
- 
 [ACTION]
- 
 Are you sure you want to proceed with this purchase?
                </message>
                <option name="Confirm">
@@ -3951,9 +3998,9 @@ Are you sure you want to proceed with this purchase?
        <alert modal="true" name="ConfirmPurchasePassword" nodefault="true">
                <message name="message">
                        This transaction will:
- 
 [ACTION]
- 
 Are you sure you want to proceed with this purchase?
 Please re-enter your password and click Confirm.
                </message>
@@ -3980,7 +4027,7 @@ will retain their original values.
                <message name="message">
                        You have selected &apos;no copy&apos; inventory items.
 These items will be moved to your inventory, not copied.
- 
 Move the inventory item(s)?
                </message>
                <ignore>
@@ -3995,12 +4042,12 @@ Move the inventory item(s)?
        </alert>
        <alert modal="true" name="MoveInventoryFromScriptedObject">
                <message name="message">
-                        You have selected &apos;no copy&apos; inventory items.  These items 
+                        You have selected &apos;no copy&apos; inventory items.  These items
 will be moved to your inventory, not copied.
- 
-Because this object is scripted, moving these items 
+Because this object is scripted, moving these items
-to your inventory may cause the script to malfunction. 
+to your inventory may cause the script to malfunction.
- 
 Move the inventory item(s)?
                </message>
                <ignore>
@@ -4015,9 +4062,9 @@ Move the inventory item(s)?
        </alert>
        <alert name="ClickActionNotPayable">
                <message name="message">
-                        Warning: The Pay Object click action has been set, but it 
+                        Warning: The Pay Object click action has been set, but it
-will only work if a script is added with a money() event. 
+will only work if a script is added with a money() event.
-This is because residents generally expect that objects 
+This is because residents generally expect that objects
 will react somehow when money is payed into them.
                </message>
                <ignore>
@@ -4045,48 +4092,48 @@ will react somehow when money is payed into them.
        </alert>
        <alert modal="true" name="HelpReportAbuseEmailLL" >
                <message name="message">
-Use this tool to report violations of the Terms of Service 
+Use this tool to report violations of the Terms of Service
-and Community Standards. See: 
+and Community Standards. See:
 -
-http://secondlife.com/corporate/tos.php 
+http://secondlife.com/corporate/tos.php
-http://secondlife.com/corporate/cs.php 
+http://secondlife.com/corporate/cs.php
 -
-All reported abuses of the Terms of Service and Community Standards 
+All reported abuses of the Terms of Service and Community Standards
 are investigated and resolved. You will receive an email informing you
-of the resolution when it occurs. You can also view the incident 
+of the resolution when it occurs. You can also view the incident
 resolution on the Police Blotter at:
- 
+-
 http://secondlife.com/community/blotter.php
                </message>
        </alert>
        <alert modal="true" name="HelpReportAbuseEmailEO">
                <message name="message">
-IMPORTANT: This report will go to the owner of the 
+IMPORTANT: This report will go to the owner of the
 region you are currently in and not to Linden Lab.
 -
-As a service to residents and visitors, the owner of 
+As a service to residents and visitors, the owner of
-the region you are in has elected to receive and resolve 
+the region you are in has elected to receive and resolve
-all reports originating in this region. Linden Lab will 
+all reports originating in this region. Linden Lab will
-not investigate reports you file from this location. 
+not investigate reports you file from this location.
-The region owner will resolve reports based on the local 
+The region owner will resolve reports based on the local
-rules of this region as outlined in the estate Covenant. 
+rules of this region as outlined in the estate Covenant.
-(View covenants by going to the World menu and selecting 
+(View covenants by going to the World menu and selecting
 About Land.)
 -
-The resolution of this report applies only to this Region; 
+The resolution of this report applies only to this Region;
-Residents access to other areas of Second Life will not be 
+Residents access to other areas of Second Life will not be
-affected by the outcome of this report. Only Linden Lab can 
+affected by the outcome of this report. Only Linden Lab can
-restrict access to the entirety of Second Life.         
+restrict access to the entirety of Second Life.
                </message>
        </alert>
        <alert modal="true" name="HelpReportBug">
                <message name="message">
-                        Use this tool to *only* report technical features that do not perform as 
+                        Use this tool to *only* report technical features that do not perform as
-described or expected, please provide as much detail as possible, You 
+described or expected, please provide as much detail as possible, You
 may reply to the auto-response email to add more details to your report.
 All bug reports are investigated and assessed. No email response will be sent.
 -
-If you are having a technical difficulty, please contact Support at: 
+If you are having a technical difficulty, please contact Support at:
 http://secondlife.com/community/support.php
 -
 Note: Incomplete reports will not be investigated
@@ -4095,42 +4142,42 @@ Note: Incomplete reports will not be investigated
        <alert modal="true" name="HelpReportAbuseSelectCategory">
                <message name="message">
                        Please select a category for this abuse report.
- 
 Selecting a category helps us file and process abuse reports.
                </message>
        </alert>
        <alert modal="true" name="HelpReportBugSelectCategory">
                <message name="message">
                        Please select a category for this bug.
- 
 Selecting a category helps us file and process bug reports.
                </message>
        </alert>
        <alert modal="true" name="HelpReportAbuseAbuserNameEmpty">
                <message name="message">
                        Please enter the name of the abuser.
- 
 Entering an accurate value helps us file and process abuse reports.
                </message>
        </alert>
        <alert modal="true" name="HelpReportAbuseAbuserLocationEmpty">
                <message name="message">
                        Please enter the location where the abuse took place.
- 
 Entering an accurate value helps us file and process abuse reports.
                </message>
        </alert>
        <alert modal="true" name="HelpReportAbuseSummaryEmpty">
                <message name="message">
                        Please enter a summary of the abuse that took place.
- 
 Entering an accurate summary helps us file and process abuse reports.
                </message>
        </alert>
        <alert modal="true" name="HelpReportBugSummaryEmpty">
                <message name="message">
                        Please enter a summary of the bug.
- 
 Entering an accurate summary helps us file and process bug reports.
                </message>
        </alert>
@@ -4139,7 +4186,7 @@ Entering an accurate summary helps us file and process bug reports.
                        Please enter a detailed description of the abuse that took place.
 Be as specific as you can, including names and the details of the
 incident you are reporting.
- 
 Entering an accurate description helps us file and process abuse reports.
                </message>
        </alert>
@@ -4148,24 +4195,24 @@ Entering an accurate description helps us file and process abuse reports.
                        Please enter a detailed description of the bug.
 Be as specific as you can, including steps to reproduce the bug
 if possible.
- 
 Entering an accurate description helps us file and process bug reports.
                </message>
        </alert>
        <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.
- 
 Thank you,
- 
 Linden Lab
                </message>
        </alert>
@@ -4195,7 +4242,7 @@ Do you want to replace it with the selected object?
                        You are in Busy Mode, which means you will not
 receive any items offered in exchange for
 this payment.
- 
 Would you like to leave Busy Mode before
 completing this transaction?
                </message>
@@ -4242,9 +4289,9 @@ the contents of your Lost And Found folder?
        <alert modal="true" name="CopySLURL">
                <message name="message">
                        The following SLURL has been copied to your clipboard:
-                        
-                         [SLURL] 
+                         [SLURL]
-                        
                        Put it in a web page to give others easy access to this location or
                        try it out yourself by pasting it into the address bar of your web browser.
                </message>
@@ -4288,4 +4335,11 @@ the contents of your Lost And Found folder?
                    OK
                </option>
        </alert>
+        <alert modal="true" name="Cannot_Purchase_an_Attachment">
+                <message name="message">
+                        Items may not be purchased while
+                        they are part of an attachment.
+                </message>
+        </alert>
 </alerts>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml b/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml
index a0e6a91..71a3bd4 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml
@@ -6,7 +6,7 @@
        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom="-40" drop_shadow_visible="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-             left="12" mouse_opaque="true" name="Type part of the person&apos;s name:"
+             left="12" mouse_opaque="true" name="Type part of the resident&apos;s name:"
             v_pad="0" width="220">
                Type part of the resident&apos;s name:
        </text>
@@ -24,7 +24,7 @@
        <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" hidden="false"
-             left="12" mouse_opaque="true" name="Or select a calling card:" v_pad="0"
+             left="12" mouse_opaque="true" name="Or select their calling card:" v_pad="0"
             width="220">
                Or select a calling card:
        </text>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
index 52af7a3..d9d8eb8 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
@@ -149,6 +149,11 @@
                             name="Folders Always By Name" width="118">
                                <on_click filter="" function="Inventory.SetSortBy" userdata="foldersalwaysbyname" />
                        </menu_item_check>
+                        <menu_item_check bottom_delta="-18" control_name="Inventory.SystemFoldersToTop" height="18"
+                             hidden="false" label="System Folders To Top" left="0" mouse_opaque="true"
+                             name="System Folders To Top" width="118">
+                                <on_click filter="" function="Inventory.SetSortBy" userdata="systemfolderstotop" />
+                        </menu_item_check>
                </menu>
                <menu bottom_delta="28" color="0, 0, 0, 1" drop_shadow="true" height="49"
                     hidden="false" label="Filters" left="0" mouse_opaque="false" name="Filters"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_lsl_guide.xml b/linden/indra/newview/skins/xui/en-us/floater_lsl_guide.xml
index 29d1fa2..773b54b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_lsl_guide.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_lsl_guide.xml
@@ -1,23 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-500" can_close="true" can_drag_on_left="false" can_minimize="true"
     can_resize="true" enabled="true" follows="left|top" height="400"
     hidden="false" left="306" min_height="271" min_width="350"
-     mouse_opaque="true" name="script ed float"
+     mouse_opaque="true" name="script ed float" rect_control="LSLHelpRect"
     title="LSL Wiki" width="370">
-        <check_box bottom="-45" enabled="true" follows="top|left" font="SansSerif"
+        <check_box bottom="-45" enabled="true" follows="top|left" font="SansSerif" halign="center"
-             halign="center" height="20" hidden="false" label="Follow cursor"
+             height="20" hidden="false" label="Follow cursor" left="10"
-             left="10" mouse_opaque="true" name="lock_check" width="60" />
+             mouse_opaque="true" name="lock_check" width="60" />
-        <combo_box bottom_delta="0" enabled="true" follows="top|left|right" font="SansSerif"
+        <combo_box allow_text_entry="true" bottom_delta="0" enabled="true"
-             halign="center" height="20" hidden="false" label="Lock"
+             follows="top|left|right" font="SansSerif" halign="center" height="20"
-             left_delta="100" mouse_opaque="true" name="history_combo"
+             hidden="false" label="Lock" left_delta="100" mouse_opaque="true"
-             width="90" />
+             name="history_combo" width="90" />
        <button bottom_delta="0" enabled="true" follows="top|right" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Back"
+             halign="center" height="20" hidden="false" label="Back" left_delta="95"
-             left_delta="95" mouse_opaque="true" name="back_btn"
+             mouse_opaque="true" name="back_btn" width="70" />
-             width="70" />
        <button bottom_delta="0" enabled="true" follows="top|right" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Forward"
+             halign="center" height="20" hidden="false" label="Forward" left_delta="75"
-             left_delta="75" mouse_opaque="true" name="fwd_btn"
+             mouse_opaque="true" name="fwd_btn" width="70" />
-             width="70" />
+        <web_browser bottom="10" follows="left|right|top|bottom" left="10" name="lsl_guide_html"
-        <web_browser left="10" right="-10" follows="left|right|top|bottom" bottom="10" top="-50" name="lsl_guide_html"/>
+             right="-10" top="-50" />
 </floater>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_mute.xml b/linden/indra/newview/skins/xui/en-us/floater_mute.xml
index bb45932..132f53a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_mute.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_mute.xml
@@ -11,8 +11,8 @@
             hidden="false" left="4" mouse_opaque="true" multi_select="false"
             name="mutes" tool_tip="List of currently muted residents" width="292" />
        <button bottom="-244" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Mute resident..."
+             halign="center" height="20" hidden="false" label="Mute Resident..."
-             label_selected="Mute resident..." left="4" mouse_opaque="true"
+             label_selected="Mute Resident..." left="4" mouse_opaque="true"
             name="Mute resident..." tool_tip="Pick a resident to mute" width="200" />
        <button bottom="-268" enabled="true" follows="left|bottom" font="SansSerif"
             halign="center" height="20" hidden="false" label="Mute object by name..."
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
index 13e5f2e..13e5f2e 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
index bd955e3..bd955e3 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml
index 66e12f0..66e12f0 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
index 91e27b7..91e27b7 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml
index cb06ebf..cb06ebf 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml
index e59ac38..e59ac38 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml
index 82113d4..82113d4 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
index d964ec3..6d4840f 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -39,6 +39,12 @@
                        <on_click function="File.CloseWindow" userdata="" />
                        <on_enable function="File.EnableCloseWindow" userdata="" />
                </menu_item_call>
+                <menu_item_call bottom="-113" enabled="true" height="19" hidden="false" label="Close All Windows"
+                     left="0" mouse_opaque="true" name="Close All Windows" shortcut="control|shift|W"
+                     width="243">
+                        <on_click function="File.CloseAllWindows" userdata="" />
+                        <on_enable function="File.EnableCloseWindow" userdata="" />
+                </menu_item_call>
                <menu_item_separator bottom="-121" enabled="true" height="8" hidden="false" label="-----------"
                     left="0" mouse_opaque="true" name="separator2" width="243" />
                <menu_item_call bottom="-140" enabled="true" height="19" hidden="false"
@@ -771,12 +777,43 @@
                        <on_click function="Tools.SelectedScriptAction" userdata="stop" />
                        <on_enable function="EditableSelected" />
                </menu_item_call>
-                <menu_item_separator bottom="-411" enabled="true" height="8" hidden="false" label="-----------"
+                        <menu_item_separator bottom="-411" enabled="true" height="8" hidden="false" label="-----------"
-                left="0" mouse_opaque="true" name="separator6" width="250" />
+                        left="0" mouse_opaque="true" name="separator7" width="250" />
-                <menu_item_call bottom="-240" enabled="true" height="19" hidden="false" label="Report Bug..."
+                        <menu bottom="-554" color="0 0 0 1" drop_shadow="true" enabled="true" height="109"
+                     hidden="false" label="Bug Reporting" left="0" mouse_opaque="false"
+                     name="Select Tool" opaque="true" tear_off="true" create_jump_keys="true"
+                     width="118">
+                        <menu_item_call bottom="-240" enabled="true" height="19" hidden="false" label="Report Bug..."
                    left="0" mouse_opaque="true" name="Report Bug..." width="166">
                        <on_click function="ShowFloater" userdata="bug reporter" />
-                </menu_item_call>
+                        </menu_item_call>
+                        <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
+                     label="Bug Reporting 101..." left="0" mouse_opaque="true"
+                     name="Bug Reporing 101..." width="166">
+                        <on_click function="PromptShowURL"
+                             userdata="WebLaunchBugReport101,https://wiki.secondlife.com/wiki/Bug_Reporting_101" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
+                     label="Security Issues..." left="0" mouse_opaque="true"
+                     name="Security Issues..." width="166">
+                        <on_click function="PromptShowURL"
+                             userdata="WebLaunchSecurityIssues,https://wiki.secondlife.com/wiki/Security_issues" />
+                        </menu_item_call>
+                        <menu_item_separator bottom="-411" enabled="true" height="8" hidden="false" label="-----------"
+                        left="0" mouse_opaque="true" name="separator7" width="250" />
+                        <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
+                     label="Public Issue Tracker..." left="0" mouse_opaque="true"
+                     name="Public Issue Tracker..." width="166">
+                        <on_click function="PromptShowURL"
+                             userdata="WebLaunchPublicIssue,https://jira.secondlife.com" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
+                     label="Public Issue Tracker Help..." left="0" mouse_opaque="true"
+                     name="Publc Issue Tracker Help..." width="166">
+                        <on_click function="PromptShowURL"
+                             userdata="WebLaunchPublicIssueHelp,https://wiki.secondlife.com/wiki/Issue_tracker" />
+                        </menu_item_call>
+                </menu>
        </menu>
        <menu bottom="219" color="0 0 0 1" drop_shadow="true" enabled="true" height="317"
             hidden="false" label="Help" left="227" mouse_opaque="false" name="Help"
diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/xui/en-us/notify.xml
index 291b1b8..54451ab 100644
--- a/linden/indra/newview/skins/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/xui/en-us/notify.xml
@@ -420,7 +420,7 @@ No scripts will run except those belonging to the land owner.
        </notify>
        <notify name="ObjectGiveItem" tip="false">
                <message name="message">
-                        An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named &apos;[OBJECTNAME]&apos;.
+                        An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME].
                </message>
                <option name="Keep">
                        Keep
@@ -434,7 +434,7 @@ No scripts will run except those belonging to the land owner.
        </notify>
        <notify name="ObjectGiveItemUnknownUser" tip="false">
                <message name="message">
-                        An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named &apos;[OBJECTNAME]&apos;.
+                        An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named [OBJECTNAME].
                </message>
                <option name="Keep">
                        Keep
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
index a92155a..8297887 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
@@ -69,12 +69,11 @@
             label="Notify when Linden dollars (L$) spent or received" left="148"
             mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
             width="256" />
-        <check_box bottom="-326" control_name="ProbeHardwareOnStartup" enabled="true"
+        <check_box bottom="-326" control_name="ShowNewInventory" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-             initial_value="false" label="Auto-detect graphics hardware on next startup"
+             initial_value="false" label="Automatic previews of new notecards/textures/landmarks"
-             left="148" mouse_opaque="true" name="probe_hardware_checkbox"
+             left="148" mouse_opaque="true" name="show_new_inventory"
             radio_style="false"
-             tool_tip="Second Life automatically configures some graphics settings based on your hardware.  If you install new hardware, you should have Second Life detect it again."
             width="270" />
        <check_box bottom="-344" control_name="UseDefaultColorPicker" enabled="true"
             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
index 3a1f32e..fd48f34 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
@@ -109,4 +109,11 @@
             increment="1" initial_val="1" label="Debug Beacon Line Width:"
             label_width="138" left="10" max_val="127" min_val="1" mouse_opaque="true"
             name="debug beacon line width" width="202" />
+        <check_box bottom="-304" control_name="ProbeHardwareOnStartup" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             initial_value="false" label="Auto-detect graphics hardware on next startup"
+             left="148" mouse_opaque="true" name="probe_hardware_checkbox"
+             radio_style="false"
+             tool_tip="Second Life automatically configures some graphics settings based on your hardware.  If you install new hardware, you should have Second Life detect it again."
+             width="270" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
index 2ee26d1..9feaafc 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
@@ -18,7 +18,7 @@
             halign="right" height="18" hidden="false" left="-120" mouse_opaque="true"
             name="BalanceText" text_color="0 1 0 1" tool_tip="Account Balance"
             v_pad="2" width="76">
-                L$
+                Loading...
        </text>
        <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
             halign="center" height="16" hidden="false"
diff --git a/linden/indra/newview/viewer.cpp b/linden/indra/newview/viewer.cpp
index c42ac69..b71c6f2 100644
--- a/linden/indra/newview/viewer.cpp
+++ b/linden/indra/newview/viewer.cpp
@@ -27,6 +27,9 @@
 */
 #include "llviewerprecompiledheaders.h"
+#include "viewer.h"
 #include "llparcel.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerjoystick.h"
@@ -104,8 +107,6 @@
 //#define LL_SEND_CRASH_REPORTS 0
-#include "viewer.h"
 //
 // Linden library headers
 //
@@ -411,8 +412,6 @@ LLFrameTimer	gRestoreGLTimer;
 BOOL                    gRestoreGL = FALSE;
-LLGlobalEconomy *gGlobalEconomy = NULL;
 // VFS globals - see viewer.h
 LLVFS* gStaticVFS = NULL;
@@ -485,6 +484,7 @@ static const char USAGE[] = "\n"
 "usage:\tviewer [options]\n"
 "options:\n"
 " -login <first> <last> <password>     log in as a user\n"
+" -autologin                           log in as last saved user\n"
 " -loginuri <URI>                      login server and CGI script to use\n"
 " -helperuri <URI>                     helper web CGI prefix to use\n"
 " -settings <filename>                 specify the filename of a\n"
@@ -515,6 +515,8 @@ static const char USAGE[] = "\n"
 #if LL_WINDOWS
 " -noprobe                             disable hardware probe\n"
 #endif
+" -noquicktime                         disable QuickTime movies, speeds startup\n"
+" -nopreload                           don't preload UI images or sounds, speeds startup\n"
 // these seem to be unused
 //" -noenv                               turn off environmental effects\n"
 //" -proxy <proxy_ip>                    specify the proxy ip address\n"
@@ -536,6 +538,8 @@ std::string gChannelName = "Second Life Release";
 LLUUID gInventoryLibraryOwner;
 LLUUID gInventoryLibraryRoot;
+bool gPreloadImages = true;
+bool gPreloadSounds = true;
 LLString gCmdLineFirstName;
 LLString gCmdLineLastName;
@@ -4035,7 +4039,7 @@ void init_audio()
        BOOL mute_audio = gSavedSettings.getBOOL("MuteAudio");
-        if (!mute_audio)
+        if (!mute_audio && gPreloadSounds)
        {
                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndAlert")));
                gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndBadKeystroke")));
@@ -4198,8 +4202,13 @@ BOOL add_object( LLPCode pcode, S32 x, S32 y, U8 use_physics )
                return FALSE;
        }
-        if (regionp
+        if (NULL == regionp)
-                && (regionp->getRegionFlags() & REGION_FLAGS_SANDBOX))
+        {
+                llwarns << "regionp was NULL; aborting function." << llendl;
+                return FALSE;
+        }
+        if (regionp->getRegionFlags() & REGION_FLAGS_SANDBOX)
        {
                LLFirstUse::useSandbox();
        }
@@ -5692,6 +5701,19 @@ int parse_args(int argc, char **argv)
                {
                        gProbeHardware = FALSE;
                }
+                else if (!strcmp(argv[j], "-noquicktime"))
+                {
+                        // Developers can log in faster if they don't load all the
+                        // quicktime dlls.
+                        gUseQuickTime = false;
+                }
+                else if (!strcmp(argv[j], "-nopreload"))
+                {
+                        // Developers can log in faster if they don't decode sounds
+                        // or images on startup, ~5 seconds faster.
+                        gPreloadSounds = false;
+                        gPreloadImages = false;
+                }
                else if (!strcmp(argv[j], "-purge"))
                {
                        purge_cache();
diff --git a/linden/indra/newview/viewer.h b/linden/indra/newview/viewer.h
index f082e99..141206c 100644
--- a/linden/indra/newview/viewer.h
+++ b/linden/indra/newview/viewer.h
@@ -29,44 +29,41 @@
 #ifndef LL_VIEWER_H
 #define LL_VIEWER_H
-#include "stdtypes.h"
+// DO NOT ADD DEPENDENCIES HERE
-#include "v3math.h"
+// Almost every file in the viewer depends on this file.
-#include "llcoord.h"
+// If you need to add a shared class, put it in its own
+// little file. JC
-#include "lltimer.h"
-#include "llframetimer.h"
-#include "lluuid.h"
-#include "llsys.h"
 #include "lltransactiontypes.h"
 #include "llviewercontrol.h"
-// ************************************************************
 // Enabled this definition to compile a 'hacked' viewer that
 // allows a hacked godmode to be toggled on and off.
 #define TOGGLE_HACKED_GODLIKE_VIEWER 
 #ifdef TOGGLE_HACKED_GODLIKE_VIEWER
 extern BOOL gHackGodmode;
 #endif
-// ************************************************************
 //
 // Forward Declarations
 //
-class LLVector3d;
+class LLAudioEngine;
-class LLViewerObject;
+class LLFrameTimer;
 class LLMessageSystem;
 class LLHost;
-class LLAudioEngine;
-class LLViewerRegion;
-class LLVFS;
-class LLGlobalEconomy;
 class LLPieMenu;
 class LLWorkerThread;
 class LLTextureFetch;
 class LLTextureCache;
 class LLPumpIO;
 class LLHTTPNode;
+class LLTimer;
+class LLUUID;
+class LLVector3;
+class LLVector3d;
+class LLViewerObject;
+class LLViewerRegion;
+class LLVFS;
 //
 // Global Variables
@@ -79,6 +76,7 @@ extern BOOL gNoRender;
 extern LLMemoryInfo gSysMemory;
 extern BOOL gLogMessages;
 extern BOOL gUseAudio;
+extern bool gPreloadImages;
 extern BOOL gConnectToSomething;
 extern BOOL gGodConnect;
 extern BOOL gRunLocal;
@@ -143,8 +141,6 @@ extern BOOL			gShowObjectUpdates;
 extern BOOL                     gTeleportDisplay;
 extern LLFrameTimer     gTeleportDisplayTimer;
-extern LLGlobalEconomy *gGlobalEconomy;
 extern std::map<S32,LLFrameTimer> gDebugTimers;
 // VFS globals - gVFS is for general use
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 0c8ef60..2f4eb7c 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -84,7 +84,6 @@ class ViewerManifest(LLManifest):
                                self.end_prefix("html/*")
                        self.end_prefix("skins")
-                self.path("featuretable.txt")
                self.path("releasenotes.txt")
                self.path("lsl_guide.html")
                self.path("gpu_table.txt")
@@ -135,6 +134,8 @@ class WindowsManifest(ViewerManifest):
                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")
@@ -408,6 +409,8 @@ class Linux_i686Manifest(LinuxManifest):
                        # recurse
                        self.end_prefix("res-sdl")
+                self.path("featuretable_linux.txt")
                self.path("app_settings/mozilla-runtime-linux-i686")
                if self.prefix("../../libraries/i686-linux/lib_release_client", "lib"):