aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-04-08 04:47:32 +1000
committerDavid Walter Seikel2013-04-08 04:47:32 +1000
commit0f7ca330c308a5edb51ee325faf26e5498b38af9 (patch)
tree1ed99b02793514c85238bbc23f7881b7c9727d37
parentA little more 64 bit clean now. (diff)
downloadmeta-impy-0f7ca330c308a5edb51ee325faf26e5498b38af9.zip
meta-impy-0f7ca330c308a5edb51ee325faf26e5498b38af9.tar.gz
meta-impy-0f7ca330c308a5edb51ee325faf26e5498b38af9.tar.bz2
meta-impy-0f7ca330c308a5edb51ee325faf26e5498b38af9.tar.xz
Delete a big bunch of unused variables.
-rw-r--r--linden/indra/llui/llfloater.cpp16
-rw-r--r--linden/indra/llui/llkeywords.cpp2
-rw-r--r--linden/indra/llui/llmenugl.cpp2
-rw-r--r--linden/indra/llui/llslider.cpp1
-rw-r--r--linden/indra/llui/lltexteditor.cpp4
-rw-r--r--linden/indra/newview/llagent.cpp17
-rw-r--r--linden/indra/newview/lldrawable.cpp2
-rw-r--r--linden/indra/newview/llflexibleobject.cpp3
-rw-r--r--linden/indra/newview/llfloateractivespeakers.cpp2
-rw-r--r--linden/indra/newview/llfloaterjoystick.cpp1
-rw-r--r--linden/indra/newview/llfloaterwater.cpp2
-rw-r--r--linden/indra/newview/llfloaterwindlight.cpp2
-rw-r--r--linden/indra/newview/llhoverview.cpp9
-rw-r--r--linden/indra/newview/llinventorybridge.cpp1
-rw-r--r--linden/indra/newview/llinventorymodel.cpp10
-rw-r--r--linden/indra/newview/llmanipscale.cpp5
-rw-r--r--linden/indra/newview/llmaniptranslate.cpp21
-rw-r--r--linden/indra/newview/llpanelavatar.cpp10
-rw-r--r--linden/indra/newview/llpanelcontents.cpp2
-rw-r--r--linden/indra/newview/llpanelface.cpp1
-rw-r--r--linden/indra/newview/llpanelgrouplandmoney.cpp5
-rw-r--r--linden/indra/newview/llpanellogin.cpp5
-rw-r--r--linden/indra/newview/llpanelmediahud.cpp1
-rw-r--r--linden/indra/newview/llspatialpartition.cpp3
-rw-r--r--linden/indra/newview/llstartup.cpp24
-rw-r--r--linden/indra/newview/lltoolcomp.cpp4
-rw-r--r--linden/indra/newview/lltoolfocus.cpp10
-rw-r--r--linden/indra/newview/llurlhistory.cpp2
-rw-r--r--linden/indra/newview/llviewercamera.cpp3
-rw-r--r--[-rwxr-xr-x]linden/indra/newview/llviewermessage.cpp3
-rw-r--r--linden/indra/newview/llviewerobject.cpp3
-rw-r--r--linden/indra/newview/llvlcomposition.cpp8
-rw-r--r--linden/indra/newview/llvoavatar.cpp7
-rw-r--r--linden/indra/newview/llvoiceclient.cpp10
-rw-r--r--linden/indra/newview/llvosurfacepatch.cpp10
-rw-r--r--linden/indra/newview/llvovolume.cpp4
-rw-r--r--linden/indra/newview/llwaterparamset.cpp2
-rw-r--r--linden/indra/newview/llworldmapview.cpp3
-rw-r--r--linden/indra/newview/panelradar.cpp3
-rw-r--r--linden/indra/newview/pipeline.cpp8
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,
277 mMinimized = FALSE; 277 mMinimized = FALSE;
278 mExpandedRect.set(0,0,0,0); 278 mExpandedRect.set(0,0,0,0);
279 279
280 S32 close_pad; // space to the right of close box
281 S32 close_box_size; // For layout purposes, how big is the close box? 280 S32 close_box_size; // For layout purposes, how big is the close box?
282 if (close_btn) 281 if (close_btn)
283 { 282 {
284 close_box_size = LLFLOATER_CLOSE_BOX_SIZE; 283 close_box_size = LLFLOATER_CLOSE_BOX_SIZE;
285 close_pad = 0;
286 } 284 }
287 else 285 else
288 { 286 {
289 close_box_size = 0; 287 close_box_size = 0;
290 close_pad = 0;
291 }
292
293 S32 minimize_box_size;
294 S32 minimize_pad;
295 if (minimizable && !drag_on_left)
296 {
297 minimize_box_size = LLFLOATER_CLOSE_BOX_SIZE;
298 minimize_pad = 0;
299 }
300 else
301 {
302 minimize_box_size = 0;
303 minimize_pad = 0;
304 } 288 }
305 289
306 // Drag Handle 290 // 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
288 288
289 const llwchar* base = wtext.c_str(); 289 const llwchar* base = wtext.c_str();
290 const llwchar* cur = base; 290 const llwchar* cur = base;
291 const llwchar* line = NULL;
292 291
293 while( *cur ) 292 while( *cur )
294 { 293 {
@@ -304,7 +303,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
304 } 303 }
305 304
306 // Start of a new line 305 // Start of a new line
307 line = cur;
308 306
309 // Skip white space 307 // Skip white space
310 while( *cur && isspace(*cur) && (*cur != '\n') ) 308 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 )
3095 LLUI::sConfigGroup->getS32("DropShadowFloater") ); 3095 LLUI::sConfigGroup->getS32("DropShadowFloater") );
3096 } 3096 }
3097 3097
3098 LLColor4 bg_color = mBackgroundColor;
3099
3100 if( mBgVisible ) 3098 if( mBgVisible )
3101 { 3099 {
3102 gl_rect_2d( 0, getRect().getHeight(), getRect().getWidth(), 0, mBackgroundColor ); 3100 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()
283 283
284 F32 opacity = getEnabled() ? 1.f : 0.3f; 284 F32 opacity = getEnabled() ? 1.f : 0.3f;
285 LLColor4 center_color = (mThumbCenterColor % opacity); 285 LLColor4 center_color = (mThumbCenterColor % opacity);
286 LLColor4 track_color = (mTrackColor % opacity);
287 286
288 // Track 287 // Track
289 LLRect track_rect(mThumbImage->getWidth() / 2, 288 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()
3077 S32 selection_right_x = mTextRect.mRight; 3077 S32 selection_right_x = mTextRect.mRight;
3078 S32 selection_right_y = mTextRect.mBottom; 3078 S32 selection_right_y = mTextRect.mBottom;
3079 3079
3080 BOOL selection_left_visible = FALSE;
3081 BOOL selection_right_visible = FALSE; 3080 BOOL selection_right_visible = FALSE;
3082 3081
3083 // Skip through the lines we aren't drawing. 3082 // Skip through the lines we aren't drawing.
@@ -3085,7 +3084,6 @@ void LLTextEditor::drawSelectionBackground()
3085 3084
3086 S32 left_line_num = cur_line; 3085 S32 left_line_num = cur_line;
3087 S32 num_lines = getLineCount(); 3086 S32 num_lines = getLineCount();
3088 S32 right_line_num = num_lines - 1;
3089 3087
3090 S32 line_start = -1; 3088 S32 line_start = -1;
3091 if (cur_line >= num_lines) 3089 if (cur_line >= num_lines)
@@ -3119,13 +3117,11 @@ void LLTextEditor::drawSelectionBackground()
3119 if( line_start <= selection_left && selection_left <= line_end ) 3117 if( line_start <= selection_left && selection_left <= line_end )
3120 { 3118 {
3121 left_line_num = cur_line; 3119 left_line_num = cur_line;
3122 selection_left_visible = TRUE;
3123 selection_left_x = mTextRect.mLeft + mGLFont->getWidth(line, 0, selection_left - line_start, mAllowEmbeddedItems); 3120 selection_left_x = mTextRect.mLeft + mGLFont->getWidth(line, 0, selection_left - line_start, mAllowEmbeddedItems);
3124 selection_left_y = text_y; 3121 selection_left_y = text_y;
3125 } 3122 }
3126 if( line_start <= selection_right && selection_right <= line_end ) 3123 if( line_start <= selection_right && selection_right <= line_end )
3127 { 3124 {
3128 right_line_num = cur_line;
3129 selection_right_visible = TRUE; 3125 selection_right_visible = TRUE;
3130 selection_right_x = mTextRect.mLeft + mGLFont->getWidth(line, 0, selection_right - line_start, mAllowEmbeddedItems); 3126 selection_right_x = mTextRect.mLeft + mGLFont->getWidth(line, 0, selection_right - line_start, mAllowEmbeddedItems);
3131 if (selection_right == line_end) 3127 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)
1613 abs_target_offset.abs(); 1613 abs_target_offset.abs();
1614 1614
1615 LLVector3 target_offset_dir = target_offset_origin; 1615 LLVector3 target_offset_dir = target_offset_origin;
1616 F32 object_radius = mFocusObject->getVObjRadius();
1617
1618 BOOL target_outside_object_extents = FALSE; 1616 BOOL target_outside_object_extents = FALSE;
1619 1617
1620 for (U32 i = VX; i <= VZ; i++) 1618 for (U32 i = VX; i <= VZ; i++)
@@ -1708,18 +1706,6 @@ BOOL LLAgent::calcCameraMinDistance(F32 &obj_min_distance)
1708 1706
1709 LLVector3 camera_offset_object(getCameraPositionAgent() - mFocusObject->getPositionAgent()); 1707 LLVector3 camera_offset_object(getCameraPositionAgent() - mFocusObject->getPositionAgent());
1710 1708
1711 // length projected orthogonal to target offset
1712 F32 camera_offset_dist = (camera_offset_object - target_offset_dir * (camera_offset_object * target_offset_dir)).magVec();
1713
1714 // calculate whether the target point would be "visible" if it were outside the bounding box
1715 // on the opposite of the splitting plane defined by object_split_axis;
1716 BOOL exterior_target_visible = FALSE;
1717 if (camera_offset_dist > object_radius)
1718 {
1719 // target is visible from camera, so turn off fov zoom
1720 exterior_target_visible = TRUE;
1721 }
1722
1723 F32 camera_offset_clip = camera_offset_object * object_split_axis; 1709 F32 camera_offset_clip = camera_offset_object * object_split_axis;
1724 F32 target_offset_clip = target_offset_dir * object_split_axis; 1710 F32 target_offset_clip = target_offset_dir * object_split_axis;
1725 1711
@@ -2538,12 +2524,10 @@ void LLAgent::autoPilot(F32 *delta_yaw)
2538 *delta_yaw = yaw; 2524 *delta_yaw = yaw;
2539 2525
2540 // Compute when to start slowing down and when to stop 2526 // Compute when to start slowing down and when to stop
2541 F32 stop_distance = mAutoPilotStopDistance;
2542 F32 slow_distance; 2527 F32 slow_distance;
2543 if (getFlying()) 2528 if (getFlying())
2544 { 2529 {
2545 slow_distance = llmax(6.f, mAutoPilotStopDistance + 5.f); 2530 slow_distance = llmax(6.f, mAutoPilotStopDistance + 5.f);
2546 stop_distance = llmax(2.f, mAutoPilotStopDistance);
2547 } 2531 }
2548 else 2532 else
2549 { 2533 {
@@ -3719,7 +3703,6 @@ F32 LLAgent::calcCameraFOVZoomFactor()
3719 else if (mFocusObject.notNull() && !mFocusObject->isAvatar()) 3703 else if (mFocusObject.notNull() && !mFocusObject->isAvatar())
3720 { 3704 {
3721 // don't FOV zoom on mostly transparent objects 3705 // don't FOV zoom on mostly transparent objects
3722 LLVector3 focus_offset = mFocusObjectOffset;
3723 F32 obj_min_dist = 0.f; 3706 F32 obj_min_dist = 0.f;
3724 if (!gSavedSettings.getBOOL("DisableMinZoomDist")) 3707 if (!gSavedSettings.getBOOL("DisableMinZoomDist"))
3725 calcCameraMinDistance(obj_min_dist); 3708 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)
494 //scaling 494 //scaling
495 LLVector3 target_scale = mVObjp->getScale(); 495 LLVector3 target_scale = mVObjp->getScale();
496 LLVector3 old_scale = mCurrentScale; 496 LLVector3 old_scale = mCurrentScale;
497 LLVector3 dest_scale = target_scale;
498 497
499 // Damping 498 // Damping
500 F32 dist_squared = 0.f; 499 F32 dist_squared = 0.f;
@@ -834,7 +833,6 @@ const LLVector3* LLDrawable::getSpatialExtents() const
834 833
835void LLDrawable::setSpatialExtents(LLVector3 min, LLVector3 max) 834void LLDrawable::setSpatialExtents(LLVector3 min, LLVector3 max)
836{ 835{
837 LLVector3 size = max - min;
838 mExtents[0] = min; 836 mExtents[0] = min;
839 mExtents[1] = max; 837 mExtents[1] = max;
840} 838}
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)
233 mSection[0].mVelocity.setVec(0,0,0); 233 mSection[0].mVelocity.setVec(0,0,0);
234 mSection[0].mAxisRotation.setQuat(begin_rot,0,0,1); 234 mSection[0].mAxisRotation.setQuat(begin_rot,0,0,1);
235 235
236 LLVector3 parentSectionPosition = mSection[0].mPosition;
237 LLVector3 last_direction = mSection[0].mDirection;
238
239 remapSections(mSection, mInitializedRes, mSection, mSimulateRes); 236 remapSections(mSection, mInitializedRes, mSection, mSimulateRes);
240 mInitializedRes = mSimulateRes; 237 mInitializedRes = mSimulateRes;
241 238
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)
1010 LLUUID speaker_id = speaker_it->first; 1010 LLUUID speaker_id = speaker_it->first;
1011 LLSpeaker* speakerp = speaker_it->second; 1011 LLSpeaker* speakerp = speaker_it->second;
1012 1012
1013 speaker_map_t::iterator cur_speaker_it = speaker_it++; 1013 speaker_it++;
1014 1014
1015 if (voice_channel_active && gVoiceClient->getVoiceEnabled(speaker_id)) 1015 if (voice_channel_active && gVoiceClient->getVoiceEnabled(speaker_id))
1016 { 1016 {
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()
100 if (child) 100 if (child)
101 { 101 {
102 LLRect r = child->getRect(); 102 LLRect r = child->getRect();
103 LLRect f = getRect();
104 rect = LLRect(350, r.mTop, r.mRight + 200, 0); 103 rect = LLRect(350, r.mTop, r.mRight + 200, 0);
105 } 104 }
106 105
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
760 LLComboBox* combo_box = sWaterMenu->getChild<LLComboBox>("WaterPresetsCombo"); 760 LLComboBox* combo_box = sWaterMenu->getChild<LLComboBox>("WaterPresetsCombo");
761 LLFloaterDayCycle* day_cycle = NULL; 761 LLFloaterDayCycle* day_cycle = NULL;
762 LLComboBox* key_combo = NULL; 762 LLComboBox* key_combo = NULL;
763 LLMultiSliderCtrl* mult_sldr = NULL;
764 763
765 if(LLFloaterDayCycle::isOpen()) 764 if(LLFloaterDayCycle::isOpen())
766 { 765 {
767 day_cycle = LLFloaterDayCycle::instance(); 766 day_cycle = LLFloaterDayCycle::instance();
768 key_combo = day_cycle->getChild<LLComboBox>("WaterKeyPresets"); 767 key_combo = day_cycle->getChild<LLComboBox>("WaterKeyPresets");
769 mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WaterDayCycleKeys");
770 } 768 }
771 769
772 std::string name = combo_box->getSelectedValue().asString(); 770 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
973 "WLPresetsCombo"); 973 "WLPresetsCombo");
974 LLFloaterDayCycle* day_cycle = NULL; 974 LLFloaterDayCycle* day_cycle = NULL;
975 LLComboBox* key_combo = NULL; 975 LLComboBox* key_combo = NULL;
976 LLMultiSliderCtrl* mult_sldr = NULL;
977 976
978 if(LLFloaterDayCycle::isOpen()) 977 if(LLFloaterDayCycle::isOpen())
979 { 978 {
980 day_cycle = LLFloaterDayCycle::instance(); 979 day_cycle = LLFloaterDayCycle::instance();
981 key_combo = day_cycle->getChild<LLComboBox>( 980 key_combo = day_cycle->getChild<LLComboBox>(
982 "WLKeyPresets"); 981 "WLKeyPresets");
983 mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
984 } 982 }
985 983
986 std::string name(combo_box->getSelectedValue().asString()); 984 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()
546 546
547 LLParcel* hover_parcel = LLViewerParcelMgr::getInstance()->getHoverParcel(); 547 LLParcel* hover_parcel = LLViewerParcelMgr::getInstance()->getHoverParcel();
548 LLUUID owner; 548 LLUUID owner;
549 S32 width = 0; 549 // Their use is commented out below. No doubt both will get deleted on a later clean up pass.
550 S32 height = 0; 550 //S32 width = 0;
551 //S32 height = 0;
551 552
552 if ( hover_parcel ) 553 if ( hover_parcel )
553 { 554 {
554 owner = hover_parcel->getOwnerID(); 555 owner = hover_parcel->getOwnerID();
555 width = S32(LLViewerParcelMgr::getInstance()->getHoverParcelWidth()); 556 // width = S32(LLViewerParcelMgr::getInstance()->getHoverParcelWidth());
556 height = S32(LLViewerParcelMgr::getInstance()->getHoverParcelHeight()); 557 // height = S32(LLViewerParcelMgr::getInstance()->getHoverParcelHeight());
557 } 558 }
558 559
559 // Line: "Land" 560 // 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,
1439 if(drop && accept) 1439 if(drop && accept)
1440 { 1440 {
1441 it = inventory_objects.begin(); 1441 it = inventory_objects.begin();
1442 InventoryObjectList::iterator first_it = inventory_objects.begin();
1443 LLMoveInv* move_inv = new LLMoveInv; 1442 LLMoveInv* move_inv = new LLMoveInv;
1444 move_inv->mObjectID = object_id; 1443 move_inv->mObjectID = object_id;
1445 move_inv->mCategoryID = category_id; 1444 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)
1211 item_array_t items; 1211 item_array_t items;
1212 update_map_t update; 1212 update_map_t update;
1213 S32 count = content["items"].size(); 1213 S32 count = content["items"].size();
1214 bool all_one_folder = true;
1215 LLUUID folder_id; 1214 LLUUID folder_id;
1216 // Does this loop ever execute more than once? 1215 // Does this loop ever execute more than once?
1217 for(S32 i = 0; i < count; ++i) 1216 for(S32 i = 0; i < count; ++i)
@@ -1244,10 +1243,6 @@ void LLInventoryModel::fetchInventoryResponder::result(const LLSD& content)
1244 { 1243 {
1245 folder_id = titem->getParentUUID(); 1244 folder_id = titem->getParentUUID();
1246 } 1245 }
1247 else
1248 {
1249 all_one_folder = false;
1250 }
1251 } 1246 }
1252 1247
1253 U32 changes = 0x0; 1248 U32 changes = 0x0;
@@ -2960,7 +2955,6 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account)
2960 item_array_t items; 2955 item_array_t items;
2961 update_map_t update; 2956 update_map_t update;
2962 S32 count = msg->getNumberOfBlocksFast(_PREHASH_InventoryData); 2957 S32 count = msg->getNumberOfBlocksFast(_PREHASH_InventoryData);
2963 bool all_one_folder = true;
2964 LLUUID folder_id; 2958 LLUUID folder_id;
2965 // Does this loop ever execute more than once? 2959 // Does this loop ever execute more than once?
2966 for(S32 i = 0; i < count; ++i) 2960 for(S32 i = 0; i < count; ++i)
@@ -2992,10 +2986,6 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account)
2992 { 2986 {
2993 folder_id = titem->getParentUUID(); 2987 folder_id = titem->getParentUUID();
2994 } 2988 }
2995 else
2996 {
2997 all_one_folder = false;
2998 }
2999 } 2989 }
3000 if(account) 2990 if(account)
3001 { 2991 {
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 )
1172 mInSnapRegime = FALSE; 1172 mInSnapRegime = FALSE;
1173 } 1173 }
1174 1174
1175 BOOL send_scale_update = FALSE;
1176 BOOL send_position_update = FALSE;
1177
1178 LLVector3 dir_agent; 1175 LLVector3 dir_agent;
1179 if( part_dir_local.mV[VX] ) 1176 if( part_dir_local.mV[VX] )
1180 { 1177 {
@@ -1191,8 +1188,6 @@ void LLManipScale::dragFace( S32 x, S32 y )
1191 stretchFace( 1188 stretchFace(
1192 projected_vec(drag_start_dir_f, dir_agent) + drag_start_center_agent, 1189 projected_vec(drag_start_dir_f, dir_agent) + drag_start_center_agent,
1193 projected_vec(drag_delta, dir_agent)); 1190 projected_vec(drag_delta, dir_agent));
1194 send_position_update = TRUE;
1195 send_scale_update = TRUE;
1196 1191
1197 mDragPointGlobal = drag_point_global; 1192 mDragPointGlobal = drag_point_global;
1198} 1193}
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)
487 } 487 }
488 } 488 }
489 489
490 // Throttle updates to 10 per second.
491 BOOL send_update = FALSE;
492
493 LLVector3 axis_f; 490 LLVector3 axis_f;
494 LLVector3d axis_d; 491 LLVector3d axis_d;
495 492
@@ -701,10 +698,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
701 LLVector3 new_position_local = selectNode->mSavedPositionLocal + (clamped_relative_move_f * objWorldRotation); 698 LLVector3 new_position_local = selectNode->mSavedPositionLocal + (clamped_relative_move_f * objWorldRotation);
702 699
703 // move and clamp root object first, before adjusting children 700 // move and clamp root object first, before adjusting children
704 if (new_position_local != old_position_local) 701
705 {
706 send_update = TRUE;
707 }
708 //RN: I forget, but we need to do this because of snapping which doesn't often result 702 //RN: I forget, but we need to do this because of snapping which doesn't often result
709 // in position changes even when the mouse moves 703 // in position changes even when the mouse moves
710 object->setPosition(new_position_local); 704 object->setPosition(new_position_local);
@@ -714,8 +708,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
714 708
715 if (selectNode->mIndividualSelection) 709 if (selectNode->mIndividualSelection)
716 { 710 {
717 send_update = FALSE;
718
719 // counter-translate child objects if we are moving the root as an individual 711 // counter-translate child objects if we are moving the root as an individual
720 object->resetChildrenPosition(old_position_local - new_position_local, TRUE) ; 712 object->resetChildrenPosition(old_position_local - new_position_local, TRUE) ;
721 } 713 }
@@ -752,7 +744,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
752 } 744 }
753 745
754 // PR: Only update if changed 746 // PR: Only update if changed
755 LLVector3d old_position_global = object->getPositionGlobal();
756 LLVector3 old_position_agent = object->getPositionAgent(); 747 LLVector3 old_position_agent = object->getPositionAgent();
757 LLVector3 new_position_agent = gAgent.getPosAgentFromGlobal(new_position_global); 748 LLVector3 new_position_agent = gAgent.getPosAgentFromGlobal(new_position_global);
758 if (object->isRootEdit()) 749 if (object->isRootEdit())
@@ -774,11 +765,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
774 { 765 {
775 // counter-translate child objects if we are moving the root as an individual 766 // counter-translate child objects if we are moving the root as an individual
776 object->resetChildrenPosition(old_position_agent - new_position_agent, TRUE) ; 767 object->resetChildrenPosition(old_position_agent - new_position_agent, TRUE) ;
777 send_update = FALSE;
778 }
779 else if (old_position_global != new_position_global)
780 {
781 send_update = TRUE;
782 } 768 }
783 } 769 }
784 selectNode->mLastPositionLocal = object->getPosition(); 770 selectNode->mLastPositionLocal = object->getPosition();
@@ -1302,7 +1288,7 @@ void LLManipTranslate::renderSnapGuides()
1302 // add in off-axis offset 1288 // add in off-axis offset
1303 tick_start += (mSnapOffsetAxis * mSnapOffsetMeters); 1289 tick_start += (mSnapOffsetAxis * mSnapOffsetMeters);
1304 1290
1305 BOOL is_sub_tick = FALSE; 1291// BOOL is_sub_tick = FALSE;
1306 F32 tick_scale = 1.f; 1292 F32 tick_scale = 1.f;
1307 for (F32 division_level = max_subdivisions; division_level >= sGridMinSubdivisionLevel; division_level /= 2.f) 1293 for (F32 division_level = max_subdivisions; division_level >= sGridMinSubdivisionLevel; division_level /= 2.f)
1308 { 1294 {
@@ -1311,7 +1297,7 @@ void LLManipTranslate::renderSnapGuides()
1311 break; 1297 break;
1312 } 1298 }
1313 tick_scale *= 0.7f; 1299 tick_scale *= 0.7f;
1314 is_sub_tick = TRUE; 1300// is_sub_tick = TRUE;
1315 } 1301 }
1316 1302
1317// S32 num_ticks_to_fade = is_sub_tick ? num_ticks_per_side / 2 : num_ticks_per_side; 1303// S32 num_ticks_to_fade = is_sub_tick ? num_ticks_per_side / 2 : num_ticks_per_side;
@@ -1533,7 +1519,6 @@ void LLManipTranslate::renderSnapGuides()
1533 1519
1534 float a = line_alpha; 1520 float a = line_alpha;
1535 1521
1536 LLColor4 col = gColors.getColor("SilhouetteChildColor");
1537 { 1522 {
1538 //draw grid behind objects 1523 //draw grid behind objects
1539 LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); 1524 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
1321{ 1321{
1322 if (avatar_id.isNull()) return; 1322 if (avatar_id.isNull()) return;
1323 1323
1324 BOOL avatar_changed = FALSE; 1324// BOOL avatar_changed = FALSE;
1325 if (avatar_id != mAvatarID) 1325// if (avatar_id != mAvatarID)
1326 { 1326// {
1327 avatar_changed = TRUE; 1327// avatar_changed = TRUE;
1328 } 1328// }
1329 mAvatarID = avatar_id; 1329 mAvatarID = avatar_id;
1330 1330
1331 // Determine if we have their calling card. 1331 // 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 @@
83 83
84BOOL LLPanelContents::postBuild() 84BOOL LLPanelContents::postBuild()
85{ 85{
86 LLRect rect = this->getRect();
87
88 setMouseOpaque(FALSE); 86 setMouseOpaque(FALSE);
89 87
90 childSetAction("button new script",&LLPanelContents::onClickNewScript, this); 88 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 @@
74 74
75BOOL LLPanelFace::postBuild() 75BOOL LLPanelFace::postBuild()
76{ 76{
77 LLRect rect = this->getRect();
78 LLTextureCtrl* mTextureCtrl; 77 LLTextureCtrl* mTextureCtrl;
79 LLColorSwatchCtrl* mColorSwatch; 78 LLColorSwatchCtrl* mColorSwatch;
80 79
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,
1390 S32 cur_land_tax; 1390 S32 cur_land_tax;
1391 S32 cur_group_tax; 1391 S32 cur_group_tax;
1392 S32 cur_parcel_dir_fee; 1392 S32 cur_parcel_dir_fee;
1393 S32 cur_total_tax;
1394 S32 proj_object_tax; 1393 S32 proj_object_tax;
1395 S32 proj_light_tax; 1394 S32 proj_light_tax;
1396 S32 proj_land_tax; 1395 S32 proj_land_tax;
1397 S32 proj_group_tax; 1396 S32 proj_group_tax;
1398 S32 proj_parcel_dir_fee; 1397 S32 proj_parcel_dir_fee;
1399 S32 proj_total_tax;
1400 S32 non_exempt_members; 1398 S32 non_exempt_members;
1401 1399
1402 msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_IntervalDays, interval_days ); 1400 msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_IntervalDays, interval_days );
@@ -1420,9 +1418,6 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
1420 msg->getStringFast(_PREHASH_MoneyData, _PREHASH_LastTaxDate, last_stipend_date); 1418 msg->getStringFast(_PREHASH_MoneyData, _PREHASH_LastTaxDate, last_stipend_date);
1421 msg->getStringFast(_PREHASH_MoneyData, _PREHASH_TaxDate, next_stipend_date); 1419 msg->getStringFast(_PREHASH_MoneyData, _PREHASH_TaxDate, next_stipend_date);
1422 1420
1423 cur_total_tax = cur_object_tax + cur_light_tax + cur_land_tax + cur_group_tax + cur_parcel_dir_fee;
1424 proj_total_tax = proj_object_tax + proj_light_tax + proj_land_tax + proj_group_tax + proj_parcel_dir_fee;
1425
1426 if (interval_days != mImplementationp->mIntervalLength || 1421 if (interval_days != mImplementationp->mIntervalLength ||
1427 current_interval != mImplementationp->mCurrentInterval) 1422 current_interval != mImplementationp->mCurrentInterval)
1428 { 1423 {
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)
602 const std::string &defaultGrid = gHippoGridManager->getDefaultGridNick(); 602 const std::string &defaultGrid = gHippoGridManager->getDefaultGridNick();
603 603
604 LLComboBox *grids = sInstance->getChild<LLComboBox>("server_combo"); 604 LLComboBox *grids = sInstance->getChild<LLComboBox>("server_combo");
605 S32 selectIndex = -1, i = 0; 605 S32 i = 0;
606 grids->removeall(); 606 grids->removeall();
607 if (defaultGrid != "") { 607 if (defaultGrid != "") {
608 grids->add(defaultGrid); 608 grids->add(defaultGrid);
609 selectIndex = i++; 609 i++;
610 } 610 }
611 HippoGridManager::GridIterator it, end = gHippoGridManager->endGrid(); 611 HippoGridManager::GridIterator it, end = gHippoGridManager->endGrid();
612 for (it = gHippoGridManager->beginGrid(); it != end; ++it) { 612 for (it = gHippoGridManager->beginGrid(); it != end; ++it) {
613 const std::string &grid = it->second->getGridNick(); 613 const std::string &grid = it->second->getGridNick();
614 if (grid != defaultGrid) { 614 if (grid != defaultGrid) {
615 grids->add(grid); 615 grids->add(grid);
616 //if (grid == mCurGrid) selectIndex = i;
617 i++; 616 i++;
618 } 617 }
619 } 618 }
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()
356 media_hud_rect.mRight += getRect().getWidth() - media_region->getRect().mRight; 356 media_hud_rect.mRight += getRect().getWidth() - media_region->getRect().mRight;
357 357
358 358
359 LLRect old_hud_rect = media_hud_rect;
360 // keep all parts of HUD on-screen 359 // keep all parts of HUD on-screen
361 media_hud_rect.intersectWith(getParent()->getLocalRect()); 360 media_hud_rect.intersectWith(getParent()->getLocalRect());
362 361
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:
2860 2860
2861 virtual bool check(LLDrawable* drawable) 2861 virtual bool check(LLDrawable* drawable)
2862 { 2862 {
2863 LLVector3 local_start = mStart;
2864 LLVector3 local_end = mEnd;
2865
2866 if (!gPipeline.hasRenderType(drawable->getRenderType()) || !drawable->isVisible()) 2863 if (!gPipeline.hasRenderType(drawable->getRenderType()) || !drawable->isVisible())
2867 { 2864 {
2868 return false; 2865 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()
348 const F32 TIMEOUT_SECONDS = 10.f; // changed from 5 to 10 seconds for OpenSim lag -- MC 348 const F32 TIMEOUT_SECONDS = 10.f; // changed from 5 to 10 seconds for OpenSim lag -- MC
349 const S32 MAX_TIMEOUT_COUNT = 3; 349 const S32 MAX_TIMEOUT_COUNT = 3;
350 static LLTimer timeout; 350 static LLTimer timeout;
351 static S32 timeout_count = 0;
352 351
353 static LLTimer login_time; 352 static LLTimer login_time;
354 static LLTimer connecting_region_timer; 353 static LLTimer connecting_region_timer;
@@ -380,11 +379,10 @@ bool idle_startup()
380 379
381 // last location by default 380 // last location by default
382 static S32 agent_location_id = START_LOCATION_ID_LAST; 381 static S32 agent_location_id = START_LOCATION_ID_LAST;
383 static S32 location_which = START_LOCATION_ID_LAST;
384 382
385 static bool show_connect_box = true; 383 static bool show_connect_box = true;
386 384
387 static bool stipend_since_login = false; 385 //static bool stipend_since_login = false;
388 386
389 static bool samename = false; 387 static bool samename = false;
390 388
@@ -799,8 +797,6 @@ bool idle_startup()
799 797
800 gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW); 798 gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
801 799
802 timeout_count = 0;
803
804 if (LLStartUp::shouldAutoLogin()) 800 if (LLStartUp::shouldAutoLogin())
805 { 801 {
806 show_connect_box = false; 802 show_connect_box = false;
@@ -1113,7 +1109,6 @@ bool idle_startup()
1113 { 1109 {
1114 // Force login at the last location 1110 // Force login at the last location
1115 agent_location_id = START_LOCATION_ID_LAST; 1111 agent_location_id = START_LOCATION_ID_LAST;
1116 location_which = START_LOCATION_ID_LAST;
1117 gSavedSettings.setBOOL("LoginLastLocation", FALSE); 1112 gSavedSettings.setBOOL("LoginLastLocation", FALSE);
1118 1113
1119 // Clear some things that would cause us to divert to a user-specified location 1114 // Clear some things that would cause us to divert to a user-specified location
@@ -1125,21 +1120,14 @@ bool idle_startup()
1125 { 1120 {
1126 // a startup URL was specified 1121 // a startup URL was specified
1127 agent_location_id = START_LOCATION_ID_URL; 1122 agent_location_id = START_LOCATION_ID_URL;
1128
1129 // doesn't really matter what location_which is, since
1130 // agent_start_look_at will be overwritten when the
1131 // UserLoginLocationReply arrives
1132 location_which = START_LOCATION_ID_LAST;
1133 } 1123 }
1134 else if (gSavedSettings.getBOOL("LoginLastLocation")) 1124 else if (gSavedSettings.getBOOL("LoginLastLocation"))
1135 { 1125 {
1136 agent_location_id = START_LOCATION_ID_LAST; // last location 1126 agent_location_id = START_LOCATION_ID_LAST; // last location
1137 location_which = START_LOCATION_ID_LAST;
1138 } 1127 }
1139 else 1128 else
1140 { 1129 {
1141 agent_location_id = START_LOCATION_ID_HOME; // home 1130 agent_location_id = START_LOCATION_ID_HOME; // home
1142 location_which = START_LOCATION_ID_HOME;
1143 } 1131 }
1144 1132
1145 gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT); 1133 gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT);
@@ -1785,11 +1773,11 @@ bool idle_startup()
1785 if((*it).second == "N") gAgent.setFirstLogin(TRUE); 1773 if((*it).second == "N") gAgent.setFirstLogin(TRUE);
1786 else gAgent.setFirstLogin(FALSE); 1774 else gAgent.setFirstLogin(FALSE);
1787 } 1775 }
1788 it = options[0].find("stipend_since_login"); 1776 //it = options[0].find("stipend_since_login");
1789 if(it != no_flag) 1777 //if(it != no_flag)
1790 { 1778 //{
1791 if((*it).second == "Y") stipend_since_login = true; 1779 // if((*it).second == "Y") stipend_since_login = true;
1792 } 1780 //}
1793 it = options[0].find("gendered"); 1781 it = options[0].find("gendered");
1794 if(it != no_flag) 1782 if(it != no_flag)
1795 { 1783 {
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()
471 471
472BOOL LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask) 472BOOL LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)
473{ 473{
474 BOOL handled = FALSE;
475 mMouseDown = TRUE; 474 mMouseDown = TRUE;
476 475
477 if ( (mask == MASK_SHIFT) || (mask == MASK_CONTROL) ) 476 if ( (mask == MASK_SHIFT) || (mask == MASK_CONTROL) )
478 { 477 {
479 gViewerWindow->pickAsync(x, y, mask, pickCallback); 478 gViewerWindow->pickAsync(x, y, mask, pickCallback);
480 handled = TRUE;
481 } 479 }
482 else 480 else
483 { 481 {
484 setCurrentTool( mPlacer ); 482 setCurrentTool( mPlacer );
485 handled = mPlacer->placeObject( x, y, mask ); 483 mPlacer->placeObject( x, y, mask );
486 } 484 }
487 485
488 mObjectPlacedOnMouseDown = TRUE; 486 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)
318 S32 dx = gViewerWindow->getCurrentMouseDX(); 318 S32 dx = gViewerWindow->getCurrentMouseDX();
319 S32 dy = gViewerWindow->getCurrentMouseDY(); 319 S32 dy = gViewerWindow->getCurrentMouseDY();
320 320
321 BOOL moved_outside_slop = FALSE;
322
323 if (hasMouseCapture() && mValidClickPoint) 321 if (hasMouseCapture() && mValidClickPoint)
324 { 322 {
325 mAccumX += llabs(dx); 323 mAccumX += llabs(dx);
@@ -327,19 +325,11 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
327 325
328 if (mAccumX >= SLOP_RANGE) 326 if (mAccumX >= SLOP_RANGE)
329 { 327 {
330 if (!mOutsideSlopX)
331 {
332 moved_outside_slop = TRUE;
333 }
334 mOutsideSlopX = TRUE; 328 mOutsideSlopX = TRUE;
335 } 329 }
336 330
337 if (mAccumY >= SLOP_RANGE) 331 if (mAccumY >= SLOP_RANGE)
338 { 332 {
339 if (!mOutsideSlopY)
340 {
341 moved_outside_slop = TRUE;
342 }
343 mOutsideSlopY = TRUE; 333 mOutsideSlopY = TRUE;
344 } 334 }
345 } 335 }
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)
119// static 119// static
120void LLURLHistory::removeURL(const std::string& collection, const std::string& url) 120void LLURLHistory::removeURL(const std::string& collection, const std::string& url)
121{ 121{
122 LLSD::array_iterator iter = sHistorySD[collection].beginArray();
123 LLSD::array_iterator end = sHistorySD[collection].endArray();
124 for(int index = 0; index < sHistorySD[collection].size(); index++) 122 for(int index = 0; index < sHistorySD[collection].size(); index++)
125 { 123 {
126 if(sHistorySD[collection].get(index).asString() == url) 124 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,
306{ 306{
307 F32 fov_y, aspect; 307 F32 fov_y, aspect;
308 fov_y = RAD_TO_DEG * getView(); 308 fov_y = RAD_TO_DEG * getView();
309 BOOL z_default_near, z_default_far = FALSE; 309 BOOL z_default_far = FALSE;
310 if (z_far <= 0) 310 if (z_far <= 0)
311 { 311 {
312 z_default_far = TRUE; 312 z_default_far = TRUE;
@@ -314,7 +314,6 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
314 } 314 }
315 if (z_near <= 0) 315 if (z_near <= 0)
316 { 316 {
317 z_default_near = TRUE;
318 z_near = getNear(); 317 z_near = getNear();
319 } 318 }
320 aspect = getAspect(); 319 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)
653bool join_group_response(const LLSD& notification, const LLSD& response) 653bool join_group_response(const LLSD& notification, const LLSD& response)
654{ 654{
655 S32 option = LLNotification::getSelectedOption(notification, response); 655 S32 option = LLNotification::getSelectedOption(notification, response);
656 BOOL delete_context_data = TRUE;
657 bool accept_invite = false; 656 bool accept_invite = false;
658 657
659 LLUUID group_id = notification["payload"]["group_id"].asUUID(); 658 LLUUID group_id = notification["payload"]["group_id"].asUUID();
@@ -682,7 +681,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
682 } 681 }
683 else 682 else
684 { 683 {
685 delete_context_data = FALSE;
686 LLSD args; 684 LLSD args;
687 args["NAME"] = name; 685 args["NAME"] = name;
688 args["INVITE"] = message; 686 args["INVITE"] = message;
@@ -696,7 +694,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
696 // sure the user is sure they want to join. 694 // sure the user is sure they want to join.
697 if (fee > 0) 695 if (fee > 0)
698 { 696 {
699 delete_context_data = FALSE;
700 LLSD args; 697 LLSD args;
701 args["COST"] = llformat("%d", fee); 698 args["COST"] = llformat("%d", fee);
702 args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol(); 699 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)
2046 if (HJT_HINGE == mJointInfo->mJointType) 2046 if (HJT_HINGE == mJointInfo->mJointType)
2047 { 2047 {
2048 // hinge = uniform circular motion 2048 // hinge = uniform circular motion
2049 LLVector3 parent_pivot = getVelocity();
2050 LLVector3 parent_axis = getAcceleration();
2051
2052 angle = dt * (ang_vel * mJointInfo->mAxisOrAnchor); // AxisOrAnchor = axis 2049 angle = dt * (ang_vel * mJointInfo->mAxisOrAnchor); // AxisOrAnchor = axis
2053 dQ.setQuat(angle, mJointInfo->mAxisOrAnchor); // AxisOrAnchor = axis 2050 dQ.setQuat(angle, mJointInfo->mAxisOrAnchor); // AxisOrAnchor = axis
2054 LLVector3 pivot_offset = pos - mJointInfo->mPivot; // pos in pivot-frame 2051 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,
384 LLPointer<LLImageRaw> raw = new LLImageRaw(tex_width, tex_height, tex_comps); 384 LLPointer<LLImageRaw> raw = new LLImageRaw(tex_width, tex_height, tex_comps);
385 U8 *rawp = raw->getData(); 385 U8 *rawp = raw->getData();
386 386
387 F32 tex_width_inv = 1.f/tex_width;
388 F32 tex_height_inv = 1.f/tex_height;
389
390 F32 st_x_stride, st_y_stride; 387 F32 st_x_stride, st_y_stride;
391 st_x_stride = ((F32)st_width / (F32)mTexScaleX)*((F32)mWidth / (F32)tex_width); 388 st_x_stride = ((F32)st_width / (F32)mTexScaleX)*((F32)mWidth / (F32)tex_width);
392 st_y_stride = ((F32)st_height / (F32)mTexScaleY)*((F32)mWidth / (F32)tex_height); 389 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,
421 tex1 = tex0 + 1; 418 tex1 = tex0 + 1;
422 tex1 = llclamp(tex1, 0, 3); 419 tex1 = llclamp(tex1, 0, 3);
423 420
424 F32 xy_int_i, xy_int_j;
425
426 xy_int_i = i * tex_width_inv;
427 xy_int_j = j * tex_height_inv;
428
429 st_offset = (lltrunc(sti) + lltrunc(stj)*st_width) * st_comps; 421 st_offset = (lltrunc(sti) + lltrunc(stj)*st_width) * st_comps;
430 for (U32 k = 0; k < tex_comps; k++) 422 for (U32 k = 0; k < tex_comps; k++)
431 { 423 {
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()
2500 2500
2501 // some of the joints have not been cached 2501 // some of the joints have not been cached
2502 LLVector3 skull = mSkullp->getPosition(); 2502 LLVector3 skull = mSkullp->getPosition();
2503 LLVector3 skull_scale = mSkullp->getScale();
2504 2503
2505 LLVector3 neck = mNeckp->getPosition(); 2504 LLVector3 neck = mNeckp->getPosition();
2506 LLVector3 neck_scale = mNeckp->getScale(); 2505 LLVector3 neck_scale = mNeckp->getScale();
@@ -2580,7 +2579,6 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys,
2580{ 2579{
2581 LLMemType mt(LLMemType::MTYPE_AVATAR); 2580 LLMemType mt(LLMemType::MTYPE_AVATAR);
2582 2581
2583 LLVector3 old_vel = getVelocity();
2584 // Do base class updates... 2582 // Do base class updates...
2585 U32 retval = LLViewerObject::processUpdateMessage(mesgsys, user_data, block_num, update_type, dp); 2583 U32 retval = LLViewerObject::processUpdateMessage(mesgsys, user_data, block_num, update_type, dp);
2586 2584
@@ -3823,8 +3821,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
3823 mNameText->setLabel(mNameString); 3821 mNameText->setLabel(mNameString);
3824 } 3822 }
3825 3823
3826 char line[MAX_STRING]; /* Flawfinder: ignore */
3827 line[0] = '\0';
3828 std::deque<LLChat>::iterator chat_iter = mChats.begin(); 3824 std::deque<LLChat>::iterator chat_iter = mChats.begin();
3829 mNameText->clearString(); 3825 mNameText->clearString();
3830 3826
@@ -4287,8 +4283,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
4287 xyVel.mV[VZ] = 0.0f; 4283 xyVel.mV[VZ] = 0.0f;
4288 speed = xyVel.length(); 4284 speed = xyVel.length();
4289 4285
4290 BOOL throttle = TRUE;
4291
4292 if (!(mIsSitting && getParent())) 4286 if (!(mIsSitting && getParent()))
4293 { 4287 {
4294 //-------------------------------------------------------------------- 4288 //--------------------------------------------------------------------
@@ -4299,7 +4293,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
4299 if (mTimeLast == 0.0f) 4293 if (mTimeLast == 0.0f)
4300 { 4294 {
4301 mTimeLast = animation_time; 4295 mTimeLast = animation_time;
4302 throttle = FALSE;
4303 4296
4304 // put the pelvis at slaved position/mRotation 4297 // put the pelvis at slaved position/mRotation
4305 mRoot.setWorldPosition( getPositionAgent() ); // first frame 4298 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()
3160 3160
3161static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVector3d &pos, LLVector3 &vel) 3161static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVector3d &pos, LLVector3 &vel)
3162{ 3162{
3163 F32 nat[3], nup[3], nl[3], nvel[3]; // the new at, up, left vectors and the new position and velocity 3163 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)
3164 F64 npos[3]; 3164 F64 npos[3];
3165 3165
3166 // The original XML command was sent like this: 3166 // The original XML command was sent like this:
@@ -3210,10 +3210,6 @@ static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVe
3210 npos[1] = pos.mdV[VZ]; 3210 npos[1] = pos.mdV[VZ];
3211 npos[2] = pos.mdV[VY]; 3211 npos[2] = pos.mdV[VY];
3212 3212
3213 nvel[0] = vel.mV[VX];
3214 nvel[1] = vel.mV[VZ];
3215 nvel[2] = vel.mV[VY];
3216
3217 for(int i=0;i<3;++i) { 3213 for(int i=0;i<3;++i) {
3218 at.mV[i] = nat[i]; 3214 at.mV[i] = nat[i];
3219 up.mV[i] = nup[i]; 3215 up.mV[i] = nup[i];
@@ -3264,10 +3260,6 @@ static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVe
3264 npos[1] = pos.mdV[VZ]; 3260 npos[1] = pos.mdV[VZ];
3265 npos[2] = pos.mdV[VY] * -1.0; 3261 npos[2] = pos.mdV[VY] * -1.0;
3266 3262
3267 nvel[0] = vel.mV[VX];
3268 nvel[1] = vel.mV[VZ];
3269 nvel[2] = vel.mV[VY];
3270
3271 for(int i=0;i<3;++i) { 3263 for(int i=0;i<3;++i) {
3272 at.mV[i] = nat[i]; 3264 at.mV[i] = nat[i];
3273 up.mV[i] = nup[i]; 3265 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,
423 S32 vertex_count = 0; 423 S32 vertex_count = 0;
424 S32 i, x, y; 424 S32 i, x, y;
425 425
426 S32 num_vertices, num_indices; 426 S32 num_vertices;
427 427
428 U32 render_stride = mLastStride; 428 U32 render_stride = mLastStride;
429 S32 patch_size = mPatchp->getSurface()->getGridsPerPatchEdge(); 429 S32 patch_size = mPatchp->getSurface()->getGridsPerPatchEdge();
@@ -441,7 +441,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
441 if (north_stride == render_stride) 441 if (north_stride == render_stride)
442 { 442 {
443 num_vertices = 2 * length + 1; 443 num_vertices = 2 * length + 1;
444 num_indices = length * 6 - 3;
445 444
446 facep->mCenterAgent = (mPatchp->getPointAgent(8, 15) + mPatchp->getPointAgent(8, 16))*0.5f; 445 facep->mCenterAgent = (mPatchp->getPointAgent(8, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
447 446
@@ -494,7 +493,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
494 { 493 {
495 // North stride is longer (has less vertices) 494 // North stride is longer (has less vertices)
496 num_vertices = length + length/2 + 1; 495 num_vertices = length + length/2 + 1;
497 num_indices = half_length*9 - 3;
498 496
499 facep->mCenterAgent = (mPatchp->getPointAgent(7, 15) + mPatchp->getPointAgent(8, 16))*0.5f; 497 facep->mCenterAgent = (mPatchp->getPointAgent(7, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
500 498
@@ -555,7 +553,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
555 length = patch_size / north_stride; 553 length = patch_size / north_stride;
556 half_length = length / 2; 554 half_length = length / 2;
557 num_vertices = length + half_length + 1; 555 num_vertices = length + half_length + 1;
558 num_indices = 9*half_length - 3;
559 556
560 facep->mCenterAgent = (mPatchp->getPointAgent(15, 7) + mPatchp->getPointAgent(16, 8))*0.5f; 557 facep->mCenterAgent = (mPatchp->getPointAgent(15, 7) + mPatchp->getPointAgent(16, 8))*0.5f;
561 558
@@ -629,7 +626,7 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
629{ 626{
630 S32 i, x, y; 627 S32 i, x, y;
631 628
632 S32 num_vertices, num_indices; 629 S32 num_vertices;
633 630
634 U32 render_stride = mLastStride; 631 U32 render_stride = mLastStride;
635 S32 patch_size = mPatchp->getSurface()->getGridsPerPatchEdge(); 632 S32 patch_size = mPatchp->getSurface()->getGridsPerPatchEdge();
@@ -642,7 +639,6 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
642 if (east_stride == render_stride) 639 if (east_stride == render_stride)
643 { 640 {
644 num_vertices = 2 * length + 1; 641 num_vertices = 2 * length + 1;
645 num_indices = length * 6 - 3;
646 642
647 facep->mCenterAgent = (mPatchp->getPointAgent(8, 15) + mPatchp->getPointAgent(8, 16))*0.5f; 643 facep->mCenterAgent = (mPatchp->getPointAgent(8, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
648 644
@@ -693,7 +689,6 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
693 { 689 {
694 // East stride is longer (has less vertices) 690 // East stride is longer (has less vertices)
695 num_vertices = length + half_length + 1; 691 num_vertices = length + half_length + 1;
696 num_indices = half_length*9 - 3;
697 692
698 facep->mCenterAgent = (mPatchp->getPointAgent(7, 15) + mPatchp->getPointAgent(8, 16))*0.5f; 693 facep->mCenterAgent = (mPatchp->getPointAgent(7, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
699 694
@@ -750,7 +745,6 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
750 length = patch_size / east_stride; 745 length = patch_size / east_stride;
751 half_length = length / 2; 746 half_length = length / 2;
752 num_vertices = length + length/2 + 1; 747 num_vertices = length + length/2 + 1;
753 num_indices = 9*(length/2) - 3;
754 748
755 facep->mCenterAgent = (mPatchp->getPointAgent(15, 7) + mPatchp->getPointAgent(16, 8))*0.5f; 749 facep->mCenterAgent = (mPatchp->getPointAgent(15, 7) + mPatchp->getPointAgent(16, 8))*0.5f;
756 750
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
3217 mep = te->getMediaData(); 3217 mep = te->getMediaData();
3218 if(mep) 3218 if(mep)
3219 { 3219 {
3220 bool update_from_self = false; 3220 //bool update_from_self = false;
3221 if (!ignore_agent) 3221 if (!ignore_agent)
3222 { 3222 {
3223 LLUUID updating_agent = LLTextureEntry::getAgentIDFromMediaVersionString(getMediaURL()); 3223 LLUUID updating_agent = LLTextureEntry::getAgentIDFromMediaVersionString(getMediaURL());
3224 update_from_self = (updating_agent == gAgent.getID()); 3224 //update_from_self = (updating_agent == gAgent.getID());
3225 } 3225 }
3226 //viewer_media_t media_impl = LLViewerMedia::updateMediaImpl(mep, previous_url, update_from_self); 3226 //viewer_media_t media_impl = LLViewerMedia::updateMediaImpl(mep, previous_url, update_from_self);
3227 3227
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)
192LLVector2 LLWaterParamSet::getVector2(const std::string& paramName, bool& error) 192LLVector2 LLWaterParamSet::getVector2(const std::string& paramName, bool& error)
193{ 193{
194 // test to see if right type 194 // test to see if right type
195 int ttest;
196 ttest = mParamValues.size();
197 LLSD cur_val = mParamValues.get(paramName); 195 LLSD cur_val = mParamValues.get(paramName);
198 if (!cur_val.isArray() || cur_val.size() != 2) 196 if (!cur_val.isArray() || cur_val.size() != 2)
199 { 197 {
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&
1192 S32 text_x = x; 1192 S32 text_x = x;
1193 S32 text_y = (S32)(y - sTrackCircleImage->getHeight()/2 - font->getLineHeight()); 1193 S32 text_y = (S32)(y - sTrackCircleImage->getHeight()/2 - font->getLineHeight());
1194 1194
1195 BOOL is_in_window = true;
1196
1197 if( x < 0 1195 if( x < 0
1198 || y < 0 1196 || y < 0
1199 || x >= getRect().getWidth() 1197 || x >= getRect().getWidth()
@@ -1206,7 +1204,6 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4&
1206 text_x = sTrackingArrowX; 1204 text_x = sTrackingArrowX;
1207 text_y = sTrackingArrowY; 1205 text_y = sTrackingArrowY;
1208 } 1206 }
1209 is_in_window = false;
1210 } 1207 }
1211 else if (LLTracker::getTrackingStatus() == LLTracker::TRACKING_LOCATION && 1208 else if (LLTracker::getTrackingStatus() == LLTracker::TRACKING_LOCATION &&
1212 LLTracker::getTrackedLocationType() != LLTracker::LOCATION_NOTHING) 1209 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()
408 static bool enable_unmute = false; 408 static bool enable_unmute = false;
409 static bool enable_track = false; 409 static bool enable_track = false;
410 static bool enable_estate = false; 410 static bool enable_estate = false;
411 static bool enable_friend = false;
412 static bool enable_cam = false; 411 static bool enable_cam = false;
413 412
414 if (mRadarTabs->getCurrentPanelIndex() == 0) // Avatar tab 413 if (mRadarTabs->getCurrentPanelIndex() == 0) // Avatar tab
@@ -426,7 +425,6 @@ void PanelRadar::updateButtonStates()
426 enable_estate = isKickable(mSelectedAvatar); 425 enable_estate = isKickable(mSelectedAvatar);
427 enable_unmute = LLMuteList::getInstance()->isMuted(mSelectedAvatar); 426 enable_unmute = LLMuteList::getInstance()->isMuted(mSelectedAvatar);
428 enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar); 427 enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
429 enable_friend = !is_agent_friend(mSelectedAvatar);
430 enable_cam = mSelectedDistance >= 0 && mSelectedDistance <= gSavedSettings.getF32("NearMeRange"); 428 enable_cam = mSelectedDistance >= 0 && mSelectedDistance <= gSavedSettings.getF32("NearMeRange");
431 } 429 }
432 else 430 else
@@ -436,7 +434,6 @@ void PanelRadar::updateButtonStates()
436 enable_estate = false; 434 enable_estate = false;
437 enable_unmute = false; 435 enable_unmute = false;
438 enable_track = false; 436 enable_track = false;
439 enable_friend = false;
440 enable_cam = false; 437 enable_cam = false;
441 } 438 }
442 439
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)
2269 const S32 bin_count = 1024*8; 2269 const S32 bin_count = 1024*8;
2270 2270
2271 static LLCullResult::drawinfo_list_t alpha_bins[bin_count]; 2271 static LLCullResult::drawinfo_list_t alpha_bins[bin_count];
2272 static U32 bin_size[bin_count];
2273 2272
2274 //clear one bin per frame to avoid memory bloat 2273 //clear one bin per frame to avoid memory bloat
2275 static S32 clear_idx = 0; 2274 static S32 clear_idx = 0;
2276 clear_idx = (1+clear_idx)%bin_count; 2275 clear_idx = (1+clear_idx)%bin_count;
2277 alpha_bins[clear_idx].clear(); 2276 alpha_bins[clear_idx].clear();
2278 2277
2279 for (U32 j = 0; j < bin_count; j++)
2280 {
2281 bin_size[j] = 0;
2282 }
2283
2284 //build render map 2278 //build render map
2285 for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i) 2279 for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
2286 { 2280 {
@@ -5956,8 +5950,6 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
5956 5950
5957 stop_glerror(); 5951 stop_glerror();
5958 5952
5959 LLVector3 origin = camera.getOrigin();
5960
5961 glPushMatrix(); 5953 glPushMatrix();
5962 5954
5963 mat.set_scale(glh::vec3f(1,1,-1)); 5955 mat.set_scale(glh::vec3f(1,1,-1));