diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llmaniptranslate.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
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); |