5 files changed, 20 insertions, 46 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index c61f7a6..54b71eb 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -3729,9 +3729,8 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
         // Compute base camera position and look-at points.
         F32                     camera_land_height;
         LLVector3d      frame_center_global = mAvatarObject.isNull() ? getPositionGlobal() 
-                                                                                                                         : getPosGlobalFromAgent(mAvatarObject->mRoot.getWorldPosition());
-                
-        LLVector3   upAxis = getUpAxis();
+                          : getPosGlobalFromAgent(mAvatarObject->mRoot.getWorldPosition());
+
         BOOL            isConstrained = FALSE;
         LLVector3d      head_offset;
         head_offset.setVec(mThirdPersonHeadOffset);
@@ -3866,7 +3865,6 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
                         // set the global camera position
                         LLVector3d camera_offset;
                         
-                        LLVector3 av_pos = mAvatarObject.isNull() ? LLVector3::zero : mAvatarObject->getRenderPosition();
                         camera_offset.setVec( local_camera_offset );
                         camera_position_global = frame_center_global + head_offset + camera_offset;
 
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index f808f89..ee49752 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -1096,7 +1096,6 @@ LLCamera LLSpatialBridge::transformCamera(LLCamera& camera)
         LLCamera ret = camera;
         LLXformMatrix* mat = mDrawable->getXform();
         LLVector3 center = LLVector3(0,0,0) * mat->getWorldMatrix();
-        LLQuaternion rotation = LLQuaternion(mat->getWorldMatrix());
 
         LLVector3 delta = ret.getOrigin() - center;
         LLQuaternion rot = ~mat->getRotation();
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index ce2b2b4..489a5d5 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -3767,12 +3767,6 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask )
                 LLMenuGL::sMenuContainer->hideMenus();
         }
 
-        LLView *item = NULL;
-        if (getChildCount() > 0)
-        {
-                item = *(getChildList()->begin());
-        }
-
         switch( key )
         {
         case KEY_F2:
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index f10910c..7fd58db 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -5223,11 +5223,6 @@ class LLViewToggleRadar: public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 LLFloaterAvatarList::toggle(0);
-                bool vis = false;
-                if(LLFloaterAvatarList::getInstance())
-                {
-                        vis = (bool)LLFloaterAvatarList::getInstance()->getVisible();
-                }
                 return true;
         }
 };
@@ -5237,11 +5232,6 @@ class LLViewToggleMOAPRadar: public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 LLFloaterMOAPRadar::toggle(0);
-                bool vis = false;
-                if(LLFloaterMOAPRadar::getInstance())
-                {
-                        vis = (bool)LLFloaterMOAPRadar::getInstance()->getVisible();
-                }
                 return true;
         }
 };
@@ -8976,12 +8966,6 @@ class LLAdvancedToggleAssetBrowser: public view_listener_t
         {
                 //open the floater
                 LLFloaterAssetBrowser::show(0);
-                
-                bool vis = false;
-                if(LLFloaterAssetBrowser::getInstance())
-                {
-                        vis = (bool)LLFloaterAssetBrowser::getInstance()->getVisible();
-                }
                 return true;
         }
 };
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index d0aa4b1..c82b1ae 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -288,7 +288,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 {
         LLFastTimer t(LLFastTimer::FTM_PROCESS_OBJECTS);        
         
-        LLVector3d camera_global = gAgent.getCameraPositionGlobal();
         LLViewerObject *objectp;
         S32                     num_objects;
         U32                     local_id;
@@ -305,28 +304,28 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
         if (!cached && !compressed && update_type != OUT_FULL)
         {
                 gTerseObjectUpdates += num_objects;
-                S32 size;
-                if (mesgsys->getReceiveCompressedSize())
-                {
-                        size = mesgsys->getReceiveCompressedSize();
-                }
-                else
-                {
-                        size = mesgsys->getReceiveSize();
-                }
+//              S32 size;
+//              if (mesgsys->getReceiveCompressedSize())
+//              {
+//                      size = mesgsys->getReceiveCompressedSize();
+//              }
+//              else
+//              {
+//                      size = mesgsys->getReceiveSize();
+//              }
 //              llinfos << "Received terse " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl;
         }
         else
         {
-                S32 size;
-                if (mesgsys->getReceiveCompressedSize())
-                {
-                        size = mesgsys->getReceiveCompressedSize();
-                }
-                else
-                {
-                        size = mesgsys->getReceiveSize();
-                }
+//              S32 size;
+//              if (mesgsys->getReceiveCompressedSize())
+//              {
+//                      size = mesgsys->getReceiveCompressedSize();
+//              }
+//              else
+//              {
+//                      size = mesgsys->getReceiveSize();
+//              }
 
 //              llinfos << "Received " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl;
                 gFullObjectUpdates += num_objects;