Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly

17 files changed, 334 insertions, 112 deletions

diff --git a/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
index 68b9679..999f754 100755
--- a/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
+++ b/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
@@ -3,33 +3,26 @@
  * @brief QuickTime plugin for LLMedia API plugin system
  *
  * @cond
- * $LicenseInfo:firstyear=2008&license=viewergpl$
- * 
- * Copyright (c) 2008-2010, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2008&license=viewerlgpl$
  * 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
+ * Copyright (C) 2010, Linden Research, Inc.
  * 
- * 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
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * 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.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
  * @endcond
  */
 
diff --git a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
index eed59a2..4a00557 100755
--- a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -37,7 +37,6 @@
 
 #include "linden_common.h"
 #include "indra_constants.h" // for indra keyboard codes
-#include <iomanip>
 
 #include "llgl.h"
 
@@ -45,10 +44,10 @@
 #include "llpluginmessage.h"
 #include "llpluginmessageclasses.h"
 #include "media_plugin_base.h"
+#include <iomanip> 
 
 // set to 1 if you're using the version of llqtwebkit that's QPixmap-ified
 #if LL_LINUX
-# include <iomanip> 
 # define LL_QTWEBKIT_USES_PIXMAPS 0
 extern "C" {
 # include <glib.h>
@@ -341,6 +340,12 @@ private:
                 // append details to agent string
                 LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent );
 
+// Viewer 2+ -- MC
+#if LL_WINDOWS
+                // Set up window open behavior
+                LLQtWebKit::getInstance()->setWindowOpenBehavior(mBrowserWindowId, LLQtWebKit::WOB_SIMULATE_BLANK_HREF_CLICK);
+#endif
+                
 #if !LL_QTWEBKIT_USES_PIXMAPS
                 // don't flip bitmap
                 LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true );
@@ -539,6 +544,7 @@ private:
                 // This will work as long as we don't need "uuid", which will be needed for MoaP.
                 message.setValue("uri", event.getStringValue());
                 message.setValue("target", event.getStringValue2());
+                message.setValueU32("target_type", event.getLinkType());
 #endif
                 sendMessage(message);
         }
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index a453c39..e9ea14b 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -482,7 +482,7 @@ BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line)
         for (int i=1; i<=3; i++)
         {
                 std::stringstream key;
-                key << "nick0" << i;
+                key << "HighlightNickname0" << i;
                 std::string nick = gSavedSettings.getString(key.str());
                 if (! nick.empty())
                 {
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index a487150..98c4d06 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -275,7 +275,11 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
                         virtual bool apply(LLViewerObject* vobjp)
                         {
                                 LLDrawable* drawable = vobjp->mDrawable;
-                                if (!drawable || vobjp->getPCode() != LL_PCODE_VOLUME || vobjp->isAttachment())
+                                if (!drawable ||
+                                        ((vobjp->getPCode() != LL_PCODE_VOLUME) &&
+                                         (vobjp->getPCode() != LL_PCODE_LEGACY_TREE) &&
+                                         (vobjp->getPCode() != LL_PCODE_LEGACY_GRASS) )||
+                                        vobjp->isAttachment())
                                 {
                                         return true;
                                 }
@@ -326,7 +330,9 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
                         LLViewerObject* vobjp = drawable->getVObj();
 
                         if (!drawable || !vobjp ||
-                                vobjp->getPCode() != LL_PCODE_VOLUME || 
+                                ((vobjp->getPCode() != LL_PCODE_VOLUME) &&
+                                 (vobjp->getPCode() != LL_PCODE_LEGACY_TREE) &&
+                                 (vobjp->getPCode() != LL_PCODE_LEGACY_GRASS) )||
                                 vobjp->isAttachment() ||
                                 (deselect && !vobjp->isSelected()))
                         {
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index 15b4615..a5c0d97 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -267,9 +267,6 @@ BOOL LLPanelDisplay::postBuild()
 
         // Object detail slider
         mCtrlDrawDistance = getChild<LLSliderCtrl>("DrawDistance");
-        mDrawDistanceMeterText1 = getChild<LLTextBox>("DrawDistanceMeterText1");
-        mDrawDistanceMeterText2 = getChild<LLTextBox>("DrawDistanceMeterText2");
-        mCtrlDrawDistance->setCommitCallback(&LLPanelDisplay::updateMeterText);
         mCtrlDrawDistance->setCallbackUserData(this);
 
         // Object detail slider
@@ -636,8 +633,6 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
         llassert(mAvatarText != NULL);
         llassert(mLightingText != NULL);
         llassert(mTerrainText != NULL);
-        llassert(mDrawDistanceMeterText1 != NULL);
-        llassert(mDrawDistanceMeterText2 != NULL);
         llassert(mAvatarCountText != NULL);
 
         // enable/disable the states
@@ -684,16 +679,8 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
         mAvatarText->setVisible(!isHidden);
         mLightingText->setVisible(!isHidden);
         mTerrainText->setVisible(!isHidden);
-        mDrawDistanceMeterText1->setVisible(!isHidden);
-        mDrawDistanceMeterText2->setVisible(!isHidden);
         mAvatarCountText->setVisible(!isHidden);
 
-        // hide one meter text if we're making things visible
-        if(!isHidden)
-        {
-                updateMeterText(mCtrlDrawDistance, this);
-        }
-
         mMeshDetailText->setVisible(!isHidden);
 
         mCtrlAvatarMaxVisible->setVisible(!isHidden);
@@ -998,22 +985,6 @@ void LLPanelDisplay::updateSliderText(LLUICtrl* ctrl, void* user_data)
         }
 }
 
-void LLPanelDisplay::updateMeterText(LLUICtrl* ctrl, void* user_data)
-{
-        // get our UI widgets
-        LLPanelDisplay* panel = (LLPanelDisplay*)user_data;
-        LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
-
-        LLTextBox* m1 = panel->getChild<LLTextBox>("DrawDistanceMeterText1");
-        LLTextBox* m2 = panel->getChild<LLTextBox>("DrawDistanceMeterText2");
-
-        // toggle the two text boxes based on whether we have 1 or two digits
-        F32 val = slider->getValueF32();
-        bool two_digits = val < 100;
-        m1->setVisible(two_digits);
-        m2->setVisible(!two_digits);
-}
-
 // static
 void LLPanelDisplay::onImpostorsEnable(LLUICtrl* ctrl, void* user_data)
 {
diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h
index e92cd2f..d7727e7 100644
--- a/linden/indra/newview/llpaneldisplay.h
+++ b/linden/indra/newview/llpaneldisplay.h
@@ -128,8 +128,6 @@ protected:
         LLTextBox               *mAvatarText;
         LLTextBox               *mTerrainText;
         LLTextBox               *mLightingText;
-        LLTextBox               *mDrawDistanceMeterText1;
-        LLTextBox               *mDrawDistanceMeterText2;
 
         LLTextBox               *mMeshDetailText;
         LLTextBox               *mLODFactorText;
@@ -194,7 +192,6 @@ protected:
         static void onCommitWindowedMode(LLUICtrl* ctrl, void *data);
         static void onApplyResolution(LLUICtrl* ctrl, void* data);
         static void updateSliderText(LLUICtrl* ctrl, void* user_data);
-        static void updateMeterText(LLUICtrl* ctrl, void* user_data);
         static void onImpostorsEnable(LLUICtrl* ctrl, void* user_data);
 
         /// callback for defaults
diff --git a/linden/indra/newview/llprefscolors.cpp b/linden/indra/newview/llprefscolors.cpp
index 36e98a4..b0bc345 100644
--- a/linden/indra/newview/llprefscolors.cpp
+++ b/linden/indra/newview/llprefscolors.cpp
@@ -71,6 +71,7 @@ BOOL LLPrefsColors::postBuild()
         updateSelfCheck();
         updateFriendsCheck();
         
+        // All three of these settings must exist, they are read by LLFloaterChat::isOwnNameInText.
         childSetValue("nick01", gSavedSettings.getString("HighlightNickname01"));
         childSetValue("nick02", gSavedSettings.getString("HighlightNickname02"));
         childSetValue("nick03", gSavedSettings.getString("HighlightNickname03"));
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 0d53e82..b0a6834 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -85,6 +85,8 @@
 #include "llviewerregion.h"
 #include "llviewerstats.h"
 #include "llvoavatar.h"
+#include "llvograss.h"
+#include "llvotree.h"
 #include "llvovolume.h"
 #include "pipeline.h"
 
@@ -832,7 +834,10 @@ void LLSelectMgr::highlightObjectOnly(LLViewerObject* objectp)
                 return;
         }
 
-        if (objectp->getPCode() != LL_PCODE_VOLUME)
+        if ((objectp->getPCode() != LL_PCODE_VOLUME) &&
+                (objectp->getPCode() != LL_PCODE_LEGACY_TREE) &&
+                (objectp->getPCode() != LL_PCODE_LEGACY_GRASS))
+
         {
                 return;
         }
@@ -880,7 +885,10 @@ void LLSelectMgr::highlightObjectAndFamily(const std::vector<LLViewerObject*>& o
                 {
                         continue;
                 }
-                if (object->getPCode() != LL_PCODE_VOLUME)
+
+                if ((object->getPCode() != LL_PCODE_VOLUME) &&
+                        (object->getPCode() != LL_PCODE_LEGACY_TREE) &&
+                        (object->getPCode() != LL_PCODE_LEGACY_GRASS))
                 {
                         continue;
                 }
@@ -900,7 +908,14 @@ void LLSelectMgr::highlightObjectAndFamily(const std::vector<LLViewerObject*>& o
 
 void LLSelectMgr::unhighlightObjectOnly(LLViewerObject* objectp)
 {
-        if (!objectp || (objectp->getPCode() != LL_PCODE_VOLUME))
+        if (!objectp)
+        {
+                return;
+        }
+
+        if ((objectp->getPCode() != LL_PCODE_VOLUME) &&
+                (objectp->getPCode() != LL_PCODE_LEGACY_TREE) &&
+                (objectp->getPCode() != LL_PCODE_LEGACY_GRASS))
         {
                 return;
         }
@@ -5020,6 +5035,14 @@ void LLSelectMgr::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_
         {
                 ((LLVOVolume*)objectp)->generateSilhouette(nodep, view_point);
         }
+        else if (objectp && objectp->getPCode() == LL_PCODE_LEGACY_GRASS)
+        {
+                ((LLVOGrass*)objectp)->generateSilhouette(nodep, view_point);
+        }
+        else if (objectp && objectp->getPCode() == LL_PCODE_LEGACY_TREE)
+        {
+                ((LLVOTree*)objectp)->generateSilhouette(nodep, view_point);
+        }
 }
 
 //
@@ -5355,8 +5378,10 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
                 glMultMatrixf((F32*) objectp->getRenderMatrix().mMatrix);
         }
 
-        LLVolume *volume = objectp->getVolume();
-        if (volume)
+        //LLVolume *volume = objectp->getVolume();
+        //if (volume)
+        // we used to only call this for volumes.  but let's render silhouettes for any node that has them.
+        if (1)
         {
                 F32 silhouette_thickness;
                 if (is_hud_object && gAgent.getAvatarObject())
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index dade65f..16f6e57 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -743,7 +743,9 @@ BOOL LLViewerCamera::areVertsVisible(LLViewerObject* volumep, BOOL all_verts)
         LLVolume* volume = volumep->getVolume();
         if (!volume)
         {
-                return FALSE;
+                BOOL inside = pointInFrustum(volumep->getRenderPosition());
+
+                return (inside > 0);
         }
 
         LLVOVolume* vo_volume = (LLVOVolume*) volumep;
diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index f738872..913ec33 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -48,6 +48,7 @@
 #include "llviewercamera.h"
 #include "llviewerimagelist.h"
 #include "llviewerregion.h"
+#include "llselectmgr.h"
 #include "pipeline.h"
 #include "llspatialpartition.h"
 #include "llworld.h"
@@ -721,3 +722,93 @@ BOOL LLVOGrass::lineSegmentIntersect(const LLVector3& start, const LLVector3& en
         return ret;
 }
 
+void LLVOGrass::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
+                                                                                   std::vector<LLVector3> &normals,
+                                                                                   std::vector<S32> &segments,
+                                                                                   const LLVector3& obj_cam_vec,
+                                                                                   const LLMatrix4& mat,
+                                                                                   const LLMatrix3& norm_mat)
+{
+        vertices.clear();
+        normals.clear();
+        segments.clear();
+
+        F32 width  = sSpeciesTable[mSpecies]->mBladeSizeX;
+        F32 height = sSpeciesTable[mSpecies]->mBladeSizeY;
+
+        for (S32 i = 0;  i < mNumBlades; i++)
+        {
+                F32 x   = exp_x[i] * mScale.mV[VX];
+                F32 y   = exp_y[i] * mScale.mV[VY];
+                F32 xf  = rot_x[i] * GRASS_BLADE_BASE * width * w_mod[i];
+                F32 yf  = rot_y[i] * GRASS_BLADE_BASE * width * w_mod[i];
+                F32 dzx = dz_x [i];
+                F32 dzy = dz_y [i];
+
+                F32 blade_height= GRASS_BLADE_HEIGHT * height * w_mod[i];
+
+                LLVector3 position1;
+
+                position1.mV[0]  = mPosition.mV[VX] + x + xf;
+                position1.mV[1]  = mPosition.mV[VY] + y + yf;
+                position1.mV[2]  = mRegionp->getLand().resolveHeightRegion(position1);
+
+                LLVector3 position2 = position1;
+
+                position2.mV[0] += dzx;
+                position2.mV[1] += dzy;
+                position2.mV[2] += blade_height;
+
+                LLVector3 position3;
+
+                position3.mV[0]  = mPosition.mV[VX] + x - xf;
+                position3.mV[1]  = mPosition.mV[VY] + y - xf;
+                position3.mV[2]  = mRegionp->getLand().resolveHeightRegion(position3);
+
+                LLVector3 position4 = position3;
+
+                position4.mV[0] += dzx;
+                position4.mV[1] += dzy;
+                position4.mV[2] += blade_height;
+
+
+                LLVector3 normal = (position1-position2) % (position2 - position3);
+                normal.normalize();
+
+                vertices.push_back(position1 + mRegionp->getOriginAgent());
+                normals.push_back(normal);
+                vertices.push_back(position2 + mRegionp->getOriginAgent());
+                normals.push_back(normal);
+                segments.push_back(vertices.size());
+
+                vertices.push_back(position2 + mRegionp->getOriginAgent());
+                normals.push_back(normal);
+                vertices.push_back(position4 + mRegionp->getOriginAgent());
+                normals.push_back(normal);
+                segments.push_back(vertices.size());
+
+                vertices.push_back(position4 + mRegionp->getOriginAgent());
+                normals.push_back(normal);
+                vertices.push_back(position3 + mRegionp->getOriginAgent());
+                normals.push_back(normal);
+                segments.push_back(vertices.size());
+
+                vertices.push_back(position3 + mRegionp->getOriginAgent());
+                normals.push_back(normal);
+                vertices.push_back(position1 + mRegionp->getOriginAgent());
+                normals.push_back(normal);
+                segments.push_back(vertices.size());
+        }
+}
+
+
+
+void LLVOGrass::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point)
+{
+        generateSilhouetteVertices(nodep->mSilhouetteVertices, nodep->mSilhouetteNormals,
+                                                           nodep->mSilhouetteSegments,
+                                                           LLVector3(0,0,0), LLMatrix4(), LLMatrix3());
+
+        nodep->mSilhouetteExists = TRUE;
+
+}
diff --git a/linden/indra/newview/llvograss.h b/linden/indra/newview/llvograss.h
index 25fa04c..c76ab93 100644
--- a/linden/indra/newview/llvograss.h
+++ b/linden/indra/newview/llvograss.h
@@ -37,6 +37,7 @@
 #include "lldarray.h"
 #include <map>
 
+class LLSelectNode;
 class LLSurfacePatch;
 class LLViewerImage;
 
@@ -76,6 +77,8 @@ public:
         /*virtual*/ BOOL updateLOD();
         /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
 
+        void    generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point);
+
         void plantBlades();
 
         /*virtual*/ BOOL    isActive() const; // Whether this object needs to do an idleUpdate.
@@ -125,6 +128,12 @@ protected:
         ~LLVOGrass();
 
 private:
+        void generateSilhouetteVertices(std::vector<LLVector3> &vertices,
+                                                                        std::vector<LLVector3> &normals,
+                                                                        std::vector<S32> &segments,
+                                                                        const LLVector3& view_vec,
+                                                                        const LLMatrix4& mat,
+                                                                        const LLMatrix3& norm_mat);
         void updateSpecies();
         F32 mLastHeight;                // For cheap update hack
         S32 mNumBlades;
diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp
index 6a59253..8c6abdc 100644
--- a/linden/indra/newview/llvotree.cpp
+++ b/linden/indra/newview/llvotree.cpp
@@ -47,6 +47,7 @@
 #include "llagent.h"
 #include "lldrawable.h"
 #include "llface.h"
+#include "llselectmgr.h"
 #include "llviewercamera.h"
 #include "llviewerimagelist.h"
 #include "llviewerobjectlist.h"
@@ -1327,3 +1328,127 @@ LLTreePartition::LLTreePartition()
         mLODPeriod = 1;
 }
 
+
+
+void LLVOTree::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
+                                                                                  std::vector<LLVector3> &normals,
+                                                                                  std::vector<S32> &segments,
+                                                                                  const LLVector3& obj_cam_vec,
+                                                                                  const LLMatrix4& local_matrix,
+                                                                                  const LLMatrix3& normal_matrix)
+{
+        vertices.clear();
+        normals.clear();
+        segments.clear();
+
+        F32 height = mBillboardScale; // *mBillboardRatio * 0.5;
+        F32 width = height * mTrunkAspect;
+
+        LLVector3 position1 = LLVector3(-width * 0.5,0,0) * local_matrix;
+        LLVector3 position2 = LLVector3(-width * 0.5,0,height) * local_matrix;
+        LLVector3 position3 = LLVector3(+width * 0.5,0,height) * local_matrix;
+        LLVector3 position4 = LLVector3(+width * 0.5,0,0) * local_matrix;
+
+        LLVector3 position5 = LLVector3(0,-width * 0.5,0) * local_matrix;
+        LLVector3 position6 = LLVector3(0,-width * 0.5,height) * local_matrix;
+        LLVector3 position7 = LLVector3(0,+width * 0.5,height) * local_matrix;
+        LLVector3 position8 = LLVector3(0,+width * 0.5,0) * local_matrix;
+
+
+        LLVector3 normal = (position1-position2) % (position2-position3);
+        normal.normalize();
+
+        vertices.push_back(position1);
+        normals.push_back(normal);
+        vertices.push_back(position2);
+        normals.push_back(normal);
+        segments.push_back(vertices.size());
+
+        vertices.push_back(position2);
+        normals.push_back(normal);
+        vertices.push_back(position3);
+        normals.push_back(normal);
+        segments.push_back(vertices.size());
+
+        vertices.push_back(position3);
+        normals.push_back(normal);
+        vertices.push_back(position4);
+        normals.push_back(normal);
+        segments.push_back(vertices.size());
+
+        vertices.push_back(position4);
+        normals.push_back(normal);
+        vertices.push_back(position1);
+        normals.push_back(normal);
+        segments.push_back(vertices.size());
+
+        normal = (position5-position6) % (position6-position7);
+        normal.normalize();
+
+        vertices.push_back(position5);
+        normals.push_back(normal);
+        vertices.push_back(position6);
+        normals.push_back(normal);
+        segments.push_back(vertices.size());
+
+        vertices.push_back(position6);
+        normals.push_back(normal);
+        vertices.push_back(position7);
+        normals.push_back(normal);
+        segments.push_back(vertices.size());
+
+        vertices.push_back(position7);
+        normals.push_back(normal);
+        vertices.push_back(position8);
+        normals.push_back(normal);
+        segments.push_back(vertices.size());
+
+        vertices.push_back(position8);
+        normals.push_back(normal);
+        vertices.push_back(position5);
+        normals.push_back(normal);
+        segments.push_back(vertices.size());
+
+}
+
+
+void LLVOTree::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point)
+{
+        LLVector3 position;
+        LLQuaternion rotation;
+
+        if (mDrawable->isActive())
+        {
+                if (mDrawable->isSpatialRoot())
+                {
+                        position = LLVector3();
+                        rotation = LLQuaternion();
+                }
+                else
+                {
+                        position = mDrawable->getPosition();
+                        rotation = mDrawable->getRotation();
+                }
+        }
+        else
+        {
+                position = getPosition() + getRegion()->getOriginAgent();;
+                rotation = getRotation();
+        }
+
+        // trees have bizzare scaling rules... because it's cool to make needless exceptions
+        // PS: the trees are the last remaining tidbit of Philip's code.  take a look sometime.
+        F32 radius = getScale().length() * 0.05f;
+        LLVector3 scale = LLVector3(1,1,1) * radius;
+
+        // compose final matrix
+        LLMatrix4 local_matrix;
+        local_matrix.initAll(scale, rotation, position);
+
+
+        generateSilhouetteVertices(nodep->mSilhouetteVertices, nodep->mSilhouetteNormals,
+                                                           nodep->mSilhouetteSegments,
+                                                           LLVector3(0,0,0), local_matrix, LLMatrix3());
+
+        nodep->mSilhouetteExists = TRUE;
+}
diff --git a/linden/indra/newview/llvotree.h b/linden/indra/newview/llvotree.h
index 855c612..57116cc 100644
--- a/linden/indra/newview/llvotree.h
+++ b/linden/indra/newview/llvotree.h
@@ -39,7 +39,7 @@
 
 class LLFace;
 class LLDrawPool;
-
+class LLSelectNode;
 
 class LLVOTree : public LLViewerObject
 {
@@ -124,6 +124,9 @@ public:
                                                                                   LLVector3* bi_normal = NULL           // return the surface bi-normal at the intersection point
                 );
 
+        void    generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point);
+
+
         static S32 sMaxTreeSpecies;
 
         struct TreeSpeciesData
@@ -200,6 +203,15 @@ protected:
         static S32 sLODVertexCount[4];
         static S32 sLODSlices[4];
         static F32 sLODAngles[4];
+
+private:
+        void generateSilhouetteVertices(std::vector<LLVector3> &vertices,
+                                                                        std::vector<LLVector3> &normals,
+                                                                        std::vector<S32> &segments,
+                                                                        const LLVector3& view_vec,
+                                                                        const LLMatrix4& mat,
+                                                                        const LLMatrix3& norm_mat);
+
 };
 
 #endif
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 72a6438..2ed0869 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -29,9 +29,6 @@
         <combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
              height="18" left="185" max_chars="20" mouse_opaque="true"
              name="windowsize combo" width="150">
-                <combo_item type="string" length="1" enabled="true" name="640x480" value="640 x 480">
-                        640x480
-                </combo_item>
                 <combo_item type="string" length="1" enabled="true" name="800x600" value="800 x 600">
                         800x600 
                 </combo_item>
@@ -44,8 +41,16 @@
                 <combo_item type="string" length="1" enabled="true" name="1024x768" value="1024 x 768">
                         1024x768
                 </combo_item>
-
-        </combo_box>
+    <combo_item type="string" length="1" enabled="true" name="1280x720" value="1280 x 720">
+      1280x720 (HDV720)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="1440x1080" value="1440 x 1080">
+      1440x1080 (HDV1080)
+    </combo_item>
+    <combo_item type="string" length="1" enabled="true" name="1920x1080" value="1920 x 1080">
+      1920x1080 (HD1080)
+    </combo_item>
+  </combo_box>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
@@ -237,35 +242,21 @@
              radio_style="false" width="256" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
        bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-       font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0"
+       font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0" 
        mouse_opaque="true" name="AvatarCountText" v_pad="0" width="128">
     Max. non-imposters:
   </text>
-  <slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarMaxVisible"
+  <slider bottom_delta="-20" can_edit_text="true" control_name="RenderAvatarMaxVisible"
        decimal_digits="0" enabled="true" follows="left|top" height="16"
-       increment="1" initial_val="35" label=""
+       increment="1" initial_val="35" label="" 
        label_width="0" left_delta="0" max_val="50" min_val="0" mouse_opaque="true"
        name="AvatarMaxVisible" show_text="true" width="100" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="457" mouse_opaque="true" name="DrawDistanceMeterText1" v_pad="0"
-             width="128">
-                m
-        </text>
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="463" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
-             width="128">
-                m
-        </text>
-        <slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
+        <slider bottom="-135" can_edit_text="true" control_name="RenderFarClip"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
-             increment="8" initial_val="160" label="Draw distance:"
-             label_width="140" left="215" max_val="512" min_val="32" mouse_opaque="true"
-             name="DrawDistance" show_text="true" width="255" />
-        <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
+             increment="4" initial_val="160" label="Draw distance (meters):"
+             label_width="140" left="215" max_val="1024" min_val="32" mouse_opaque="true"
+             name="DrawDistance" show_text="true" width="262" />
+        <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="256" initial_val="4096"
              label="Max. particle count:" label_width="140" left_delta="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
index ce2d5ad..4639ef3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
@@ -41,12 +41,12 @@
   </text>
 
   <slider name="near_me_range" label="" control_name="NearMeRange"
-          bottom_delta="0" left_delta="62" width="150" height="15"
-          follows="left|top" min_val="5" max_val="2048" increment="1"
-          initial_val="96" decimal_digits="0" />
+          bottom_delta="0" left_delta="58" width="110" height="15"
+          follows="left|top" min_val="5" max_val="1024" increment="1"
+          initial_val="96" decimal_digits="0" can_edit_text="true" />
 
   <text name="meters"
-        bottom_delta="0" left_delta="10" height="15" width="40"
+        bottom_delta="0" left_delta="113" height="15" width="40"
         h_pad="0" halign="left" v_pad="0" follows="left|top"
         bg_visible="false" border_drop_shadow_visible="false"
         border_visible="false" drop_shadow_visible="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
index 3849efd..c7769cc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -3,24 +3,17 @@
      follows="right|bottom" height="67" left="0" mouse_opaque="true"
      name="windlight_remote" use_bounding_rect="true" width="182">
         <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="67" left="0" width="182" />
-        <slider bottom="-20" can_edit_text="false" control_name="RenderFarClip"
+        <slider bottom="-20" can_edit_text="true" control_name="RenderFarClip"
        decimal_digits="0" enabled="true" height="18"
-       increment="8" initial_val="160" label="Draw distance:"
-       label_width="78" left="6" max_val="512" min_val="32" mouse_opaque="true"
-       name="DrawDistance" show_text="true" width="170" />
-  <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
+       increment="4" initial_val="160" label="Draw distance:"
+       label_width="74" left="4" max_val="1024" min_val="32" mouse_opaque="true"
+       name="DrawDistance" show_text="true" width="174" />
+  <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
        decimal_digits="0" enabled="true" follows="left|top" height="18"
        increment="256" initial_val="4096"
-       label="Max. particles:" label_width="78" left_delta="0"
+       label="Max. particles:" label_width="74" left_delta="0"
        max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
-       show_text="true" width="176" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12"
-             left="170" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
-             width="8">
-    m
-  </text>
+       show_text="true" width="174" />
         <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" />
   <string name="atmosphere">
     Atmosphere
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index e0f08b2..41495ca 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1087,7 +1087,7 @@ class Linux_x86_64Manifest(LinuxManifest):
             self.path("libuuid.so", "libuuid.so.1")
             self.path("libSDL-1.2.so.0")
             self.path("libELFIO.so")
-            self.path("libjpeg.so.62")
+            self.path("libjpeg.so.7")
             self.path("libpng12.so.0")
             self.path("libopenjpeg.so.2")
             self.path("libxml2.so.2")