diff options
author | McCabe Maxsted | 2009-06-13 21:55:31 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-13 21:55:31 -0700 |
commit | 0280f6e63524bf8f4bc9741fb8086590a278accd (patch) | |
tree | 1cbbccea711e2be4d43878f3e31a16616926c8cf /linden/indra/newview/llnetmap.cpp | |
parent | Applied Aimee's patch for VWR-4106: Mini-map beacon icon doesn't display corr... (diff) | |
download | meta-impy-0280f6e63524bf8f4bc9741fb8086590a278accd.zip meta-impy-0280f6e63524bf8f4bc9741fb8086590a278accd.tar.gz meta-impy-0280f6e63524bf8f4bc9741fb8086590a278accd.tar.bz2 meta-impy-0280f6e63524bf8f4bc9741fb8086590a278accd.tar.xz |
Applied Aimee's patch for VWR-12631: setting to adjust the maximum size of objects displayed on the minimap (MiniMapPrimMaxRadius)
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llnetmap.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp index 9c607e0..6fa6745 100644 --- a/linden/indra/newview/llnetmap.cpp +++ b/linden/indra/newview/llnetmap.cpp | |||
@@ -626,11 +626,7 @@ void LLNetMap::renderScaledPointGlobal( const LLVector3d& pos, const LLColor4U & | |||
626 | LLVector3 local_pos; | 626 | LLVector3 local_pos; |
627 | local_pos.setVec( pos - mObjectImageCenterGlobal ); | 627 | local_pos.setVec( pos - mObjectImageCenterGlobal ); |
628 | 628 | ||
629 | // DEV-17370 - megaprims of size > 4096 cause lag. (go figger.) | 629 | S32 diameter_pixels = llround(2 * radius_meters * mObjectMapTPM); |
630 | const F32 MAX_RADIUS = 256.0f; | ||
631 | F32 radius_clamped = llmin(radius_meters, MAX_RADIUS); | ||
632 | |||
633 | S32 diameter_pixels = llround(2 * radius_clamped * mObjectMapTPM); | ||
634 | renderPoint( local_pos, color, diameter_pixels ); | 630 | renderPoint( local_pos, color, diameter_pixels ); |
635 | } | 631 | } |
636 | 632 | ||