diff options
| author | thickbrick | 2010-11-20 14:55:44 +0200 |
|---|---|---|
| committer | thickbrick | 2010-11-20 14:55:44 +0200 |
| commit | 0e81c179bc3d4f0b5eef09eb368a1662c7feb4fd (patch) | |
| tree | 3a1922c6dca860ceaa96ac03bb22c1a528cff46f /linden/indra | |
| parent | Fix #705 (SNOW-717): Prevent mouse cursor flicker (diff) | |
| download | meta-impy-0e81c179bc3d4f0b5eef09eb368a1662c7feb4fd.zip meta-impy-0e81c179bc3d4f0b5eef09eb368a1662c7feb4fd.tar.gz meta-impy-0e81c179bc3d4f0b5eef09eb368a1662c7feb4fd.tar.bz2 meta-impy-0e81c179bc3d4f0b5eef09eb368a1662c7feb4fd.tar.xz | |
Fix #724: Snap guides in scale manipulator not shown.
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/llmanipscale.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp index 268e431..b38abe4 100644 --- a/linden/indra/newview/llmanipscale.cpp +++ b/linden/indra/newview/llmanipscale.cpp | |||
| @@ -1523,7 +1523,7 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox) | |||
| 1523 | F32 max_subdivisions = sGridMaxSubdivisionLevel; | 1523 | F32 max_subdivisions = sGridMaxSubdivisionLevel; |
| 1524 | F32 grid_alpha = gSavedSettings.getF32("GridOpacity"); | 1524 | F32 grid_alpha = gSavedSettings.getF32("GridOpacity"); |
| 1525 | 1525 | ||
| 1526 | F32 max_point_on_scale_line = partToMaxScale(mManipPart, bbox); | 1526 | F32 max_point_on_scale_line = llmin(partToMaxScale(mManipPart, bbox), LLWorld::getInstance()->getRegionWidthInMeters()); |
| 1527 | LLVector3 drag_point = gAgent.getPosAgentFromGlobal(mDragPointGlobal); | 1527 | LLVector3 drag_point = gAgent.getPosAgentFromGlobal(mDragPointGlobal); |
| 1528 | 1528 | ||
| 1529 | updateGridSettings(); | 1529 | updateGridSettings(); |