Merge remote-tracking branch 'imprudence/next' into next

Unless otherwise stated, Imprudence changes accepted.  The three images seem to be the same.
Conflicts:
	.gitignore
	linden/indra/develop.py
	linden/indra/llcommon/llsdserialize_xml.cpp
	linden/indra/newview/CMakeLists.txt
		Manually combined MOAP, OTR, and WL changes from both.
	linden/indra/newview/app_settings/default_grids.xml
		Manually merged the grid collection.
		Also updated IG info.
	linden/indra/newview/hippoupdate.cpp
	linden/indra/newview/llettherebelight.cpp
		Just used the Imprudence copy.
	linden/indra/newview/llviewermessage.cpp
		Keep unbranding.
	linden/indra/newview/llvoavatar.cpp
		Manually merge client tags.
	linden/indra/newview/res/viewerRes.rc
		Manually merge version from Impy.
	linden/indra/newview/skins/dark/colors_base.xml
		Keep unbranding.
	linden/indra/newview/skins/default/html/unabletoconnect.png
	linden/indra/newview/skins/default/textures/icon_top_pick.tga
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
		Manual merging of contributors.
	linden/indra/newview/skins/gemini/colors_base.xml
		Keep unbranding.
	linden/indra/newview/skins/gemini/textures/icon_top_pick.tga
	linden/indra/newview/viewer_manifest.py
		Manually merged boost, gstreamer, OTR, and name.
	linden/indra/newview/viewerinfo.cpp
		Manually merge the comment.

1 files changed, 1 insertions, 5 deletions

diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index fecab65..69a5621 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -131,9 +131,6 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center,
 
         mLastPointOfInterest = point_of_interest;
 
-        // constrain to max distance from avatar
-        LLVector3 camera_offset = center - gAgent.getPositionAgent();
-
         LLViewerRegion * regp = gAgent.getRegion();
         F32 water_height = (NULL != regp) ? regp->getWaterHeight() : 0.f;
 
@@ -306,7 +303,7 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
 {
         F32 fov_y, aspect;
         fov_y = RAD_TO_DEG * getView();
-        BOOL z_default_near, z_default_far = FALSE;
+        BOOL z_default_far = FALSE;
         if (z_far <= 0)
         {
                 z_default_far = TRUE;
@@ -314,7 +311,6 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
         }
         if (z_near <= 0)
         {
-                z_default_near = TRUE;
                 z_near = getNear();
         }
         aspect = getAspect();