40 files changed, 29 insertions, 202 deletions
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 58c717a..4c4aeaf 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -277,30 +277,14 @@ void LLFloater::initFloater(const std::string& title,
        mMinimized = FALSE;
        mExpandedRect.set(0,0,0,0);
        
-        S32 close_pad;                  // space to the right of close box
        S32 close_box_size;             // For layout purposes, how big is the close box?
        if (close_btn)
        {
                close_box_size = LLFLOATER_CLOSE_BOX_SIZE;
-                close_pad = 0;
        }
        else
        {
                close_box_size = 0;
-                close_pad = 0;
-        }
-        S32 minimize_box_size;
-        S32 minimize_pad;
-        if (minimizable && !drag_on_left)
-        {
-                minimize_box_size = LLFLOATER_CLOSE_BOX_SIZE;
-                minimize_pad = 0;
-        }
-        else
-        {
-                minimize_box_size = 0;
-                minimize_pad = 0;
        }
        // Drag Handle
diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp
index 93da44c..a50dbff 100644
--- a/linden/indra/llui/llkeywords.cpp
+++ b/linden/indra/llui/llkeywords.cpp
@@ -288,7 +288,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
        const llwchar* base = wtext.c_str();
        const llwchar* cur = base;
-        const llwchar* line = NULL;
        while( *cur )
        {
@@ -304,7 +303,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
                        }
                        // Start of a new line
-                        line = cur;
                        // Skip white space
                        while( *cur && isspace(*cur) && (*cur != '\n')  )
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 2d4a2f1..6850891 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -3095,8 +3095,6 @@ void LLMenuGL::draw( void )
                        LLUI::sConfigGroup->getS32("DropShadowFloater") );
        }
-        LLColor4 bg_color = mBackgroundColor;
        if( mBgVisible )
        {
                gl_rect_2d(  0, getRect().getHeight(),   getRect().getWidth(),    0, mBackgroundColor );
diff --git a/linden/indra/llui/llslider.cpp b/linden/indra/llui/llslider.cpp
index 5c17baa..c8f5935 100644
--- a/linden/indra/llui/llslider.cpp
+++ b/linden/indra/llui/llslider.cpp
@@ -283,7 +283,6 @@ void LLSlider::draw()
        F32 opacity = getEnabled() ? 1.f : 0.3f;
        LLColor4 center_color = (mThumbCenterColor % opacity);
-        LLColor4 track_color = (mTrackColor % opacity);
        // Track
        LLRect track_rect(mThumbImage->getWidth() / 2, 
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index c8ca5bf..1c12ff3 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -3077,7 +3077,6 @@ void LLTextEditor::drawSelectionBackground()
                S32 selection_right_x   = mTextRect.mRight;
                S32 selection_right_y   = mTextRect.mBottom;
-                BOOL selection_left_visible = FALSE;
                BOOL selection_right_visible = FALSE;
                // Skip through the lines we aren't drawing.
@@ -3085,7 +3084,6 @@ void LLTextEditor::drawSelectionBackground()
                S32 left_line_num = cur_line;
                S32 num_lines = getLineCount();
-                S32 right_line_num = num_lines - 1;
                S32 line_start = -1;
                if (cur_line >= num_lines)
@@ -3119,13 +3117,11 @@ void LLTextEditor::drawSelectionBackground()
                        if( line_start <= selection_left && selection_left <= line_end )
                        {
                                left_line_num = cur_line;
-                                selection_left_visible = TRUE;
                                selection_left_x = mTextRect.mLeft + mGLFont->getWidth(line, 0, selection_left - line_start, mAllowEmbeddedItems);
                                selection_left_y = text_y;
                        }
                        if( line_start <= selection_right && selection_right <= line_end )
                        {
-                                right_line_num = cur_line;
                                selection_right_visible = TRUE;
                                selection_right_x = mTextRect.mLeft + mGLFont->getWidth(line, 0, selection_right - line_start, mAllowEmbeddedItems);
                                if (selection_right == line_end)
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 09d65d1..c61f7a6 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -1613,8 +1613,6 @@ BOOL LLAgent::calcCameraMinDistance(F32 &obj_min_distance)
        abs_target_offset.abs();
        LLVector3 target_offset_dir = target_offset_origin;
-        F32 object_radius = mFocusObject->getVObjRadius();
        BOOL target_outside_object_extents = FALSE;
        for (U32 i = VX; i <= VZ; i++)
@@ -1708,18 +1706,6 @@ BOOL LLAgent::calcCameraMinDistance(F32 &obj_min_distance)
        LLVector3 camera_offset_object(getCameraPositionAgent() - mFocusObject->getPositionAgent());
-        // length projected orthogonal to target offset
-        F32 camera_offset_dist = (camera_offset_object - target_offset_dir * (camera_offset_object * target_offset_dir)).magVec();
-        // calculate whether the target point would be "visible" if it were outside the bounding box
-        // on the opposite of the splitting plane defined by object_split_axis;
-        BOOL exterior_target_visible = FALSE;
-        if (camera_offset_dist > object_radius)
-        {
-                // target is visible from camera, so turn off fov zoom
-                exterior_target_visible = TRUE;
-        }
        F32 camera_offset_clip = camera_offset_object * object_split_axis;
        F32 target_offset_clip = target_offset_dir * object_split_axis;
@@ -2538,12 +2524,10 @@ void LLAgent::autoPilot(F32 *delta_yaw)
                *delta_yaw = yaw;
                // Compute when to start slowing down and when to stop
-                F32 stop_distance = mAutoPilotStopDistance;
                F32 slow_distance;
                if (getFlying())
                {
                        slow_distance = llmax(6.f, mAutoPilotStopDistance + 5.f);
-                        stop_distance = llmax(2.f, mAutoPilotStopDistance);
                }
                else
                {
@@ -3719,7 +3703,6 @@ F32	LLAgent::calcCameraFOVZoomFactor()
        else if (mFocusObject.notNull() && !mFocusObject->isAvatar())
        {
                // don't FOV zoom on mostly transparent objects
-                LLVector3 focus_offset = mFocusObjectOffset;
                F32 obj_min_dist = 0.f;
                if (!gSavedSettings.getBOOL("DisableMinZoomDist"))
                        calcCameraMinDistance(obj_min_dist);
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 5a383bc..f808f89 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -494,7 +494,6 @@ F32 LLDrawable::updateXform(BOOL undamped)
        //scaling
        LLVector3 target_scale = mVObjp->getScale();
        LLVector3 old_scale = mCurrentScale;
-        LLVector3 dest_scale = target_scale;
        
        // Damping
        F32 dist_squared = 0.f;
@@ -834,7 +833,6 @@ const LLVector3* LLDrawable::getSpatialExtents() const
 void LLDrawable::setSpatialExtents(LLVector3 min, LLVector3 max)
 { 
-        LLVector3 size = max - min;
        mExtents[0] = min; 
        mExtents[1] = max; 
 }
diff --git a/linden/indra/newview/llflexibleobject.cpp b/linden/indra/newview/llflexibleobject.cpp
index 8f2c6d5..ad4341c 100644
--- a/linden/indra/newview/llflexibleobject.cpp
+++ b/linden/indra/newview/llflexibleobject.cpp
@@ -233,9 +233,6 @@ void LLVolumeImplFlexible::setAttributesOfAllSections(LLVector3* inScale)
        mSection[0].mVelocity.setVec(0,0,0);
        mSection[0].mAxisRotation.setQuat(begin_rot,0,0,1);
-        LLVector3 parentSectionPosition = mSection[0].mPosition;
-        LLVector3 last_direction = mSection[0].mDirection;
        remapSections(mSection, mInitializedRes, mSection, mSimulateRes);
        mInitializedRes = mSimulateRes;
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index 75cf176..c1ba5da 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -1010,7 +1010,7 @@ void LLSpeakerMgr::update(BOOL resort_ok)
                LLUUID speaker_id = speaker_it->first;
                LLSpeaker* speakerp = speaker_it->second;
                
-                speaker_map_t::iterator  cur_speaker_it = speaker_it++;
+                speaker_it++;
                if (voice_channel_active && gVoiceClient->getVoiceEnabled(speaker_id))
                {
diff --git a/linden/indra/newview/llfloaterjoystick.cpp b/linden/indra/newview/llfloaterjoystick.cpp
index 960eebb..4584abc 100644
--- a/linden/indra/newview/llfloaterjoystick.cpp
+++ b/linden/indra/newview/llfloaterjoystick.cpp
@@ -100,7 +100,6 @@ BOOL LLFloaterJoystick::postBuild()
        if (child)
        {
                LLRect r = child->getRect();
-                LLRect f = getRect();
                rect = LLRect(350, r.mTop, r.mRight + 200, 0);
        }
diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index 782c56e..3530f54 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -760,13 +760,11 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
                LLComboBox* combo_box = sWaterMenu->getChild<LLComboBox>("WaterPresetsCombo");
                LLFloaterDayCycle* day_cycle = NULL;
                LLComboBox* key_combo = NULL;
-                LLMultiSliderCtrl* mult_sldr = NULL;
                if(LLFloaterDayCycle::isOpen()) 
                {
                        day_cycle = LLFloaterDayCycle::instance();
                        key_combo = day_cycle->getChild<LLComboBox>("WaterKeyPresets");
-                        mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WaterDayCycleKeys");
                }
                std::string name = combo_box->getSelectedValue().asString();
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 4937232..8f2eafb 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -973,14 +973,12 @@ bool LLFloaterWindLight::deleteAlertCallback(const LLSD& notification, const LLS
                        "WLPresetsCombo");
                LLFloaterDayCycle* day_cycle = NULL;
                LLComboBox* key_combo = NULL;
-                LLMultiSliderCtrl* mult_sldr = NULL;
                if(LLFloaterDayCycle::isOpen()) 
                {
                        day_cycle = LLFloaterDayCycle::instance();
                        key_combo = day_cycle->getChild<LLComboBox>( 
                                "WLKeyPresets");
-                        mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
                }
                std::string name(combo_box->getSelectedValue().asString());
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 4f248e4..91cb8a5 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -546,14 +546,15 @@ void LLHoverView::updateText()
                LLParcel* hover_parcel = LLViewerParcelMgr::getInstance()->getHoverParcel();
                LLUUID owner;
-                S32 width = 0;
+                // Their use is commented out below.  No doubt both will get deleted on a later clean up pass.
-                S32 height = 0;
+                //S32 width = 0;
+                //S32 height = 0;
                if ( hover_parcel )
                {
                        owner = hover_parcel->getOwnerID();
-                        width = S32(LLViewerParcelMgr::getInstance()->getHoverParcelWidth());
+                //      width = S32(LLViewerParcelMgr::getInstance()->getHoverParcelWidth());
-                        height = S32(LLViewerParcelMgr::getInstance()->getHoverParcelHeight());
+                //      height = S32(LLViewerParcelMgr::getInstance()->getHoverParcelHeight());
                }
                // Line: "Land"
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index eb2170a..df32eab 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -1439,7 +1439,6 @@ BOOL move_inv_category_world_to_agent(const LLUUID& object_id,
        if(drop && accept)
        {
                it = inventory_objects.begin();
-                InventoryObjectList::iterator first_it = inventory_objects.begin();
                LLMoveInv* move_inv = new LLMoveInv;
                move_inv->mObjectID = object_id;
                move_inv->mCategoryID = category_id;
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 3f74965..40cbc43 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -1211,7 +1211,6 @@ void  LLInventoryModel::fetchInventoryResponder::result(const LLSD& content)
        item_array_t items;
        update_map_t update;
        S32 count = content["items"].size();
-        bool all_one_folder = true;
        LLUUID folder_id;
        // Does this loop ever execute more than once?
        for(S32 i = 0; i < count; ++i)
@@ -1244,10 +1243,6 @@ void  LLInventoryModel::fetchInventoryResponder::result(const LLSD& content)
                {
                        folder_id = titem->getParentUUID();
                }
-                else
-                {
-                        all_one_folder = false;
-                }
        }
        U32 changes = 0x0;
@@ -2960,7 +2955,6 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account)
        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?
        for(S32 i = 0; i < count; ++i)
@@ -2992,10 +2986,6 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account)
                {
                        folder_id = titem->getParentUUID();
                }
-                else
-                {
-                        all_one_folder = false;
-                }
        }
        if(account)
        {
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index 33ee1b9..593f765 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -1172,9 +1172,6 @@ void LLManipScale::dragFace( S32 x, S32 y )
                mInSnapRegime = FALSE;
        }
-        BOOL send_scale_update = FALSE;
-        BOOL send_position_update = FALSE;
        LLVector3 dir_agent;
        if( part_dir_local.mV[VX] )
        {
@@ -1191,8 +1188,6 @@ void LLManipScale::dragFace( S32 x, S32 y )
        stretchFace( 
                projected_vec(drag_start_dir_f, dir_agent) + drag_start_center_agent,
                projected_vec(drag_delta, dir_agent));
-        send_position_update = TRUE;
-        send_scale_update = TRUE;
        mDragPointGlobal = drag_point_global;
 }
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index 53578ca..4816eac 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -487,9 +487,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                }
        }
-        // Throttle updates to 10 per second.
-        BOOL send_update = FALSE;
        LLVector3               axis_f;
        LLVector3d              axis_d;
@@ -701,10 +698,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                                LLVector3 new_position_local = selectNode->mSavedPositionLocal + (clamped_relative_move_f * objWorldRotation);
                                // move and clamp root object first, before adjusting children
-                                if (new_position_local != old_position_local)
-                                {
-                                        send_update = TRUE;
-                                }
                                //RN: I forget, but we need to do this because of snapping which doesn't often result
                                // in position changes even when the mouse moves
                                object->setPosition(new_position_local);
@@ -714,8 +708,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                                if (selectNode->mIndividualSelection)
                                {
-                                        send_update = FALSE;
-                
                                        // counter-translate child objects if we are moving the root as an individual
                                        object->resetChildrenPosition(old_position_local - new_position_local, TRUE) ;                                  
                                }
@@ -752,7 +744,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                                }
                                // PR: Only update if changed
-                                LLVector3d old_position_global = object->getPositionGlobal();
                                LLVector3 old_position_agent = object->getPositionAgent();
                                LLVector3 new_position_agent = gAgent.getPosAgentFromGlobal(new_position_global);
                                if (object->isRootEdit())
@@ -774,11 +765,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                                {
                                        // counter-translate child objects if we are moving the root as an individual
                                        object->resetChildrenPosition(old_position_agent - new_position_agent, TRUE) ;                                  
-                                        send_update = FALSE;
-                                }
-                                else if (old_position_global != new_position_global)
-                                {
-                                        send_update = TRUE;
                                }
                        }
                        selectNode->mLastPositionLocal  = object->getPosition();
@@ -1302,7 +1288,7 @@ void LLManipTranslate::renderSnapGuides()
                                        // add in off-axis offset
                                        tick_start += (mSnapOffsetAxis * mSnapOffsetMeters);
-                                        BOOL is_sub_tick = FALSE;
+//                                      BOOL is_sub_tick = FALSE;
                                        F32 tick_scale = 1.f;
                                        for (F32 division_level = max_subdivisions; division_level >= sGridMinSubdivisionLevel; division_level /= 2.f)
                                        {
@@ -1311,7 +1297,7 @@ void LLManipTranslate::renderSnapGuides()
                                                        break;
                                                }
                                                tick_scale *= 0.7f;
-                                                is_sub_tick = TRUE;
+//                                              is_sub_tick = TRUE;
                                        }
 //                                      S32 num_ticks_to_fade = is_sub_tick ? num_ticks_per_side / 2 : num_ticks_per_side;
@@ -1533,7 +1519,6 @@ void LLManipTranslate::renderSnapGuides()
                
                float a = line_alpha;
-                LLColor4 col = gColors.getColor("SilhouetteChildColor");
                {
                        //draw grid behind objects
                        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index dc0db8b..f249d2a 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1321,11 +1321,11 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
 {
        if (avatar_id.isNull()) return;
-        BOOL avatar_changed = FALSE;
+//      BOOL avatar_changed = FALSE;
-        if (avatar_id != mAvatarID)
+//      if (avatar_id != mAvatarID)
-        {
+//      {
-                avatar_changed = TRUE;
+//              avatar_changed = TRUE;
-        }
+//      }
        mAvatarID = avatar_id;
        // Determine if we have their calling card.
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index 02befea..c5df81c 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -83,8 +83,6 @@
 BOOL LLPanelContents::postBuild()
 {
-        LLRect rect = this->getRect();
        setMouseOpaque(FALSE);
        childSetAction("button new script",&LLPanelContents::onClickNewScript, this);
diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index b9a40da..d8401de 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -74,7 +74,6 @@
 BOOL    LLPanelFace::postBuild()
 {
-        LLRect  rect = this->getRect();
        LLTextureCtrl*  mTextureCtrl;
        LLColorSwatchCtrl*      mColorSwatch;
diff --git a/linden/indra/newview/llpanelgrouplandmoney.cpp b/linden/indra/newview/llpanelgrouplandmoney.cpp
index 3f128fe..e15f585 100644
--- a/linden/indra/newview/llpanelgrouplandmoney.cpp
+++ b/linden/indra/newview/llpanelgrouplandmoney.cpp
@@ -1390,13 +1390,11 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
        S32 cur_land_tax;
        S32 cur_group_tax;
        S32 cur_parcel_dir_fee;
-        S32 cur_total_tax;
        S32 proj_object_tax;
        S32 proj_light_tax;
        S32 proj_land_tax;
        S32 proj_group_tax;
        S32 proj_parcel_dir_fee;
-        S32 proj_total_tax;
        S32     non_exempt_members;
        msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_IntervalDays, interval_days );
@@ -1420,9 +1418,6 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
        msg->getStringFast(_PREHASH_MoneyData, _PREHASH_LastTaxDate, last_stipend_date);
        msg->getStringFast(_PREHASH_MoneyData, _PREHASH_TaxDate, next_stipend_date);
-        cur_total_tax = cur_object_tax + cur_light_tax + cur_land_tax + cur_group_tax +  cur_parcel_dir_fee;
-        proj_total_tax = proj_object_tax + proj_light_tax + proj_land_tax + proj_group_tax + proj_parcel_dir_fee;
        if (interval_days != mImplementationp->mIntervalLength || 
                current_interval != mImplementationp->mCurrentInterval)
        {
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 824c5b0..524ecf6 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -602,18 +602,17 @@ void LLPanelLogin::addServer(const std::string& server)
        const std::string &defaultGrid = gHippoGridManager->getDefaultGridNick();
        LLComboBox *grids = sInstance->getChild<LLComboBox>("server_combo");
-        S32 selectIndex = -1, i = 0;
+        S32 i = 0;
        grids->removeall();
        if (defaultGrid != "") {
                grids->add(defaultGrid);
-                selectIndex = i++;
+                i++;
        }
        HippoGridManager::GridIterator it, end = gHippoGridManager->endGrid();
        for (it = gHippoGridManager->beginGrid(); it != end; ++it) {
                const std::string &grid = it->second->getGridNick();
                if (grid != defaultGrid) {
                        grids->add(grid);
-                        //if (grid == mCurGrid) selectIndex = i;
                        i++;
                }
        }
diff --git a/linden/indra/newview/llpanelmediahud.cpp b/linden/indra/newview/llpanelmediahud.cpp
index 39c4b63..c4afe27 100644
--- a/linden/indra/newview/llpanelmediahud.cpp
+++ b/linden/indra/newview/llpanelmediahud.cpp
@@ -356,7 +356,6 @@ void LLPanelMediaHUD::updateShape()
                media_hud_rect.mRight += getRect().getWidth() - media_region->getRect().mRight;
-                LLRect old_hud_rect = media_hud_rect;
                // keep all parts of HUD on-screen
                media_hud_rect.intersectWith(getParent()->getLocalRect());
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index d9fa5b5..30f7c0b 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -2860,9 +2860,6 @@ public:
        virtual bool check(LLDrawable* drawable)
        {       
-                LLVector3 local_start = mStart;
-                LLVector3 local_end = mEnd;
                if (!gPipeline.hasRenderType(drawable->getRenderType()) || !drawable->isVisible())
                {
                        return false;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index d853dc0..2fd96df 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -348,7 +348,6 @@ bool idle_startup()
        const F32 TIMEOUT_SECONDS = 10.f; // changed from 5 to 10 seconds for OpenSim lag -- MC
        const S32 MAX_TIMEOUT_COUNT = 3;
        static LLTimer timeout;
-        static S32 timeout_count = 0;
        static LLTimer login_time;
        static LLTimer connecting_region_timer;
@@ -380,11 +379,10 @@ bool idle_startup()
        // last location by default
        static S32  agent_location_id = START_LOCATION_ID_LAST;
-        static S32  location_which = START_LOCATION_ID_LAST;
        static bool show_connect_box = true;
-        static bool stipend_since_login = false;
+        //static bool stipend_since_login = false;
        static bool samename = false;
@@ -799,8 +797,6 @@ bool idle_startup()
                
                gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
-                timeout_count = 0;
-                
                if (LLStartUp::shouldAutoLogin())
                {
                        show_connect_box = false;
@@ -1113,7 +1109,6 @@ bool idle_startup()
                {
                        // Force login at the last location
                        agent_location_id = START_LOCATION_ID_LAST;
-                        location_which = START_LOCATION_ID_LAST;
                        gSavedSettings.setBOOL("LoginLastLocation", FALSE);
                        
                        // Clear some things that would cause us to divert to a user-specified location
@@ -1125,21 +1120,14 @@ bool idle_startup()
                {
                        // a startup URL was specified
                        agent_location_id = START_LOCATION_ID_URL;
-                        // doesn't really matter what location_which is, since
-                        // agent_start_look_at will be overwritten when the
-                        // UserLoginLocationReply arrives
-                        location_which = START_LOCATION_ID_LAST;
                }
                else if (gSavedSettings.getBOOL("LoginLastLocation"))
                {
                        agent_location_id = START_LOCATION_ID_LAST;     // last location
-                        location_which = START_LOCATION_ID_LAST;
                }
                else
                {
                        agent_location_id = START_LOCATION_ID_HOME;     // home
-                        location_which = START_LOCATION_ID_HOME;
                }
                gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT);
@@ -1785,11 +1773,11 @@ bool idle_startup()
                                        if((*it).second == "N") gAgent.setFirstLogin(TRUE);
                                        else gAgent.setFirstLogin(FALSE);
                                }
-                                it = options[0].find("stipend_since_login");
+                                //it = options[0].find("stipend_since_login");
-                                if(it != no_flag)
+                                //if(it != no_flag)
-                                {
+                                //{
-                                        if((*it).second == "Y") stipend_since_login = true;
+                                //      if((*it).second == "Y") stipend_since_login = true;
-                                }
+                                //}
                                it = options[0].find("gendered");
                                if(it != no_flag)
                                {
diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index 7bf99f0..172f71d 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -471,18 +471,16 @@ LLToolCompCreate::~LLToolCompCreate()
 BOOL LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-        BOOL handled = FALSE;
        mMouseDown = TRUE;
        if ( (mask == MASK_SHIFT) || (mask == MASK_CONTROL) )
        {
                gViewerWindow->pickAsync(x, y, mask, pickCallback);
-                handled = TRUE;
        }
        else
        {
                setCurrentTool( mPlacer );
-                handled = mPlacer->placeObject( x, y, mask );
+                mPlacer->placeObject( x, y, mask );
        }
        
        mObjectPlacedOnMouseDown = TRUE;
diff --git a/linden/indra/newview/lltoolfocus.cpp b/linden/indra/newview/lltoolfocus.cpp
index ae0cd1e..c0dedb6 100644
--- a/linden/indra/newview/lltoolfocus.cpp
+++ b/linden/indra/newview/lltoolfocus.cpp
@@ -318,8 +318,6 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
        S32 dx = gViewerWindow->getCurrentMouseDX();
        S32 dy = gViewerWindow->getCurrentMouseDY();
        
-        BOOL moved_outside_slop = FALSE;
-        
        if (hasMouseCapture() && mValidClickPoint)
        {
                mAccumX += llabs(dx);
@@ -327,19 +325,11 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
                if (mAccumX >= SLOP_RANGE)
                {
-                        if (!mOutsideSlopX)
-                        {
-                                moved_outside_slop = TRUE;
-                        }
                        mOutsideSlopX = TRUE;
                }
                if (mAccumY >= SLOP_RANGE)
                {
-                        if (!mOutsideSlopY)
-                        {
-                                moved_outside_slop = TRUE;
-                        }
                        mOutsideSlopY = TRUE;
                }
        }
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index b187f3b..1d6c87f 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -119,8 +119,6 @@ void LLURLHistory::addURL(const std::string& collection, const std::string& url)
 // static
 void LLURLHistory::removeURL(const std::string& collection, const std::string& url)
 {
-        LLSD::array_iterator iter = sHistorySD[collection].beginArray();
-        LLSD::array_iterator end = sHistorySD[collection].endArray();
        for(int index = 0; index < sHistorySD[collection].size(); index++)
        {
                if(sHistorySD[collection].get(index).asString() == url)
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index fecab65..5a09433 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -306,7 +306,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 +314,6 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
        }
        if (z_near <= 0)
        {
-                z_default_near = TRUE;
                z_near = getNear();
        }
        aspect = getAspect();
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index f0c7c0c..9dd02eb 100755..100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -653,7 +653,6 @@ void send_sound_trigger(const LLUUID& sound_id, F32 gain)
 bool join_group_response(const LLSD& notification, const LLSD& response)
 {
        S32 option = LLNotification::getSelectedOption(notification, response);
-        BOOL delete_context_data = TRUE;
        bool accept_invite = false;
        LLUUID group_id = notification["payload"]["group_id"].asUUID();
@@ -682,7 +681,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
                }
                else
                {
-                        delete_context_data = FALSE;
                        LLSD args;
                        args["NAME"] = name;
                        args["INVITE"] = message;
@@ -696,7 +694,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
                // sure the user is sure they want to join.
                if (fee > 0)
                {
-                        delete_context_data = FALSE;
                        LLSD args;
                        args["COST"] = llformat("%d", fee);
                        args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 576f312..880e1bb 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -2046,9 +2046,6 @@ BOOL LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
                                if (HJT_HINGE == mJointInfo->mJointType)
                                {
                                        // hinge = uniform circular motion
-                                        LLVector3 parent_pivot = getVelocity();
-                                        LLVector3 parent_axis = getAcceleration();
-        
                                        angle = dt * (ang_vel * mJointInfo->mAxisOrAnchor);     // AxisOrAnchor = axis
                                        dQ.setQuat(angle, mJointInfo->mAxisOrAnchor);           // AxisOrAnchor = axis
                                        LLVector3 pivot_offset = pos - mJointInfo->mPivot;      // pos in pivot-frame
diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index afd9b95..beec1f1 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -384,9 +384,6 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y,
        LLPointer<LLImageRaw> raw = new LLImageRaw(tex_width, tex_height, tex_comps);
        U8 *rawp = raw->getData();
-        F32 tex_width_inv = 1.f/tex_width;
-        F32 tex_height_inv = 1.f/tex_height;
        F32 st_x_stride, st_y_stride;
        st_x_stride = ((F32)st_width / (F32)mTexScaleX)*((F32)mWidth / (F32)tex_width);
        st_y_stride = ((F32)st_height / (F32)mTexScaleY)*((F32)mWidth / (F32)tex_height);
@@ -421,11 +418,6 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y,
                        tex1 = tex0 + 1;
                        tex1 = llclamp(tex1, 0, 3);
-                        F32 xy_int_i, xy_int_j;
-                        xy_int_i = i * tex_width_inv;
-                        xy_int_j = j * tex_height_inv;
                        st_offset = (lltrunc(sti) + lltrunc(stj)*st_width) * st_comps;
                        for (U32 k = 0; k < tex_comps; k++)
                        {
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 359ac74..aac4e41 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -2500,7 +2500,6 @@ void LLVOAvatar::computeBodySize()
        // some of the joints have not been cached
        LLVector3 skull = mSkullp->getPosition();
-        LLVector3 skull_scale = mSkullp->getScale();
        LLVector3 neck = mNeckp->getPosition();
        LLVector3 neck_scale = mNeckp->getScale();
@@ -2580,7 +2579,6 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys,
 {
        LLMemType mt(LLMemType::MTYPE_AVATAR);
-        LLVector3 old_vel = getVelocity();
        // Do base class updates...
        U32 retval = LLViewerObject::processUpdateMessage(mesgsys, user_data, block_num, update_type, dp);
@@ -3823,8 +3821,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                        mNameText->setLabel(mNameString);
                                }
-                                char line[MAX_STRING];          /* Flawfinder: ignore */
-                                line[0] = '\0';
                                std::deque<LLChat>::iterator chat_iter = mChats.begin();
                                mNameText->clearString();
@@ -4287,8 +4283,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
        xyVel.mV[VZ] = 0.0f;
        speed = xyVel.length();
-        BOOL throttle = TRUE;
        if (!(mIsSitting && getParent()))
        {
                //--------------------------------------------------------------------
@@ -4299,7 +4293,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
                if (mTimeLast == 0.0f)
                {
                        mTimeLast = animation_time;
-                        throttle = FALSE;
                        // put the pelvis at slaved position/mRotation
                        mRoot.setWorldPosition( getPositionAgent() ); // first frame
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 2035b62..703bcc2 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -3160,7 +3160,7 @@ void LLVoiceClient::giveUp()
 static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVector3d &pos, LLVector3 &vel)
 {
-        F32 nat[3], nup[3], nl[3], nvel[3]; // the new at, up, left vectors and the  new position and velocity
+        F32 nat[3], nup[3], nl[3]; // the new at, up, left vectors and the  new position and velocity (velocity was not used, so I deleted it)
        F64 npos[3];
        
        // The original XML command was sent like this:
@@ -3210,10 +3210,6 @@ static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVe
        npos[1] = pos.mdV[VZ];
        npos[2] = pos.mdV[VY];
-        nvel[0] = vel.mV[VX];
-        nvel[1] = vel.mV[VZ];
-        nvel[2] = vel.mV[VY];
        for(int i=0;i<3;++i) {
                at.mV[i] = nat[i];
                up.mV[i] = nup[i];
@@ -3264,10 +3260,6 @@ static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVe
        npos[1] = pos.mdV[VZ];
        npos[2] = pos.mdV[VY] * -1.0;
-        nvel[0] = vel.mV[VX];
-        nvel[1] = vel.mV[VZ];
-        nvel[2] = vel.mV[VY];
        for(int i=0;i<3;++i) {
                at.mV[i] = nat[i];
                up.mV[i] = nup[i];
diff --git a/linden/indra/newview/llvosurfacepatch.cpp b/linden/indra/newview/llvosurfacepatch.cpp
index 1671880..380eff5 100644
--- a/linden/indra/newview/llvosurfacepatch.cpp
+++ b/linden/indra/newview/llvosurfacepatch.cpp
@@ -423,7 +423,7 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
        S32 vertex_count = 0;
        S32 i, x, y;
-        S32 num_vertices, num_indices;
+        S32 num_vertices;
        U32 render_stride = mLastStride;
        S32 patch_size = mPatchp->getSurface()->getGridsPerPatchEdge();
@@ -441,7 +441,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
        if (north_stride == render_stride)
        {
                num_vertices = 2 * length + 1;
-                num_indices = length * 6 - 3;
                facep->mCenterAgent = (mPatchp->getPointAgent(8, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
@@ -494,7 +493,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
        {
                // North stride is longer (has less vertices)
                num_vertices = length + length/2 + 1;
-                num_indices = half_length*9 - 3;
                facep->mCenterAgent = (mPatchp->getPointAgent(7, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
@@ -555,7 +553,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
                length = patch_size / north_stride;
                half_length = length / 2;
                num_vertices = length + half_length + 1;
-                num_indices = 9*half_length - 3;
                facep->mCenterAgent = (mPatchp->getPointAgent(15, 7) + mPatchp->getPointAgent(16, 8))*0.5f;
@@ -629,7 +626,7 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
 {
        S32 i, x, y;
-        S32 num_vertices, num_indices;
+        S32 num_vertices;
        U32 render_stride = mLastStride;
        S32 patch_size = mPatchp->getSurface()->getGridsPerPatchEdge();
@@ -642,7 +639,6 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
        if (east_stride == render_stride)
        {
                num_vertices = 2 * length + 1;
-                num_indices = length * 6 - 3;
                facep->mCenterAgent = (mPatchp->getPointAgent(8, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
@@ -693,7 +689,6 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
        {
                // East stride is longer (has less vertices)
                num_vertices = length + half_length + 1;
-                num_indices = half_length*9 - 3;
                facep->mCenterAgent = (mPatchp->getPointAgent(7, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
@@ -750,7 +745,6 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
                length = patch_size / east_stride;
                half_length = length / 2;
                num_vertices = length + length/2 + 1;
-                num_indices = 9*(length/2) - 3;
                facep->mCenterAgent = (mPatchp->getPointAgent(15, 7) + mPatchp->getPointAgent(16, 8))*0.5f;
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index cb38c86..2b9f94c 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -3217,11 +3217,11 @@ void LLVOVolume::syncMediaData(S32 texture_index, const LLSD &media_data, bool m
        mep = te->getMediaData();
        if(mep)
        {
-                bool update_from_self = false;
+                //bool update_from_self = false;
                if (!ignore_agent) 
                {
                        LLUUID updating_agent = LLTextureEntry::getAgentIDFromMediaVersionString(getMediaURL());
-                        update_from_self = (updating_agent == gAgent.getID());
+                        //update_from_self = (updating_agent == gAgent.getID());
                }
                //viewer_media_t media_impl = LLViewerMedia::updateMediaImpl(mep, previous_url, update_from_self);
                        
diff --git a/linden/indra/newview/llwaterparamset.cpp b/linden/indra/newview/llwaterparamset.cpp
index 4b2e426..5825a23 100644
--- a/linden/indra/newview/llwaterparamset.cpp
+++ b/linden/indra/newview/llwaterparamset.cpp
@@ -192,8 +192,6 @@ LLVector3 LLWaterParamSet::getVector3(const std::string& paramName, bool& error)
 LLVector2 LLWaterParamSet::getVector2(const std::string& paramName, bool& error) 
 {
        // test to see if right type
-        int ttest;
-        ttest = mParamValues.size();
        LLSD cur_val = mParamValues.get(paramName);
        if (!cur_val.isArray() || cur_val.size() != 2) 
        {
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index d7a6838..b2cab52 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -1192,8 +1192,6 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4&
        S32 text_x = x;
        S32 text_y = (S32)(y - sTrackCircleImage->getHeight()/2 - font->getLineHeight());
-        BOOL is_in_window = true;
        if(    x < 0 
                || y < 0 
                || x >= getRect().getWidth() 
@@ -1206,7 +1204,6 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4&
                        text_x = sTrackingArrowX;
                        text_y = sTrackingArrowY;
                }
-                is_in_window = false;
        }
        else if (LLTracker::getTrackingStatus() == LLTracker::TRACKING_LOCATION &&
                LLTracker::getTrackedLocationType() != LLTracker::LOCATION_NOTHING)
diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp
index c94c0d1..ad6efc2 100644
--- a/linden/indra/newview/panelradar.cpp
+++ b/linden/indra/newview/panelradar.cpp
@@ -408,7 +408,6 @@ void PanelRadar::updateButtonStates()
        static bool enable_unmute = false;
        static bool enable_track = false;
        static bool enable_estate = false;
-        static bool enable_friend = false;
        static bool enable_cam = false;
        if (mRadarTabs->getCurrentPanelIndex() == 0) // Avatar tab
@@ -426,7 +425,6 @@ void PanelRadar::updateButtonStates()
                enable_estate = isKickable(mSelectedAvatar);
                enable_unmute = LLMuteList::getInstance()->isMuted(mSelectedAvatar);
                enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
-                enable_friend = !is_agent_friend(mSelectedAvatar);
                enable_cam = mSelectedDistance >= 0 && mSelectedDistance <= gSavedSettings.getF32("NearMeRange");
        }
        else
@@ -436,7 +434,6 @@ void PanelRadar::updateButtonStates()
                enable_estate = false;
                enable_unmute = false;
                enable_track = false;
-                enable_friend = false;
                enable_cam = false;
        }
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 61ad8b7..ae7461c 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -2269,18 +2269,12 @@ void LLPipeline::postSort(LLCamera& camera)
        const S32 bin_count = 1024*8;
                
        static LLCullResult::drawinfo_list_t alpha_bins[bin_count];
-        static U32 bin_size[bin_count];
        //clear one bin per frame to avoid memory bloat
        static S32 clear_idx = 0;
        clear_idx = (1+clear_idx)%bin_count;
        alpha_bins[clear_idx].clear();
-        for (U32 j = 0; j < bin_count; j++)
-        {
-                bin_size[j] = 0;
-        }
        //build render map
        for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
        {
@@ -5956,8 +5950,6 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
                        stop_glerror();
-                        LLVector3 origin = camera.getOrigin();
                        glPushMatrix();
                        mat.set_scale(glh::vec3f(1,1,-1));