diff options
| author | James Cook <james@lindenlab.com> | 2010-03-09 14:28:48 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-09 14:28:48 -0800 |
| commit | 717a4800f1ae0ae6ea0bbe9ed0af21c7851f5d0a (patch) | |
| tree | 88eaacce1385606e9f0f98b3d46108dc0f06ed26 /indra/newview/llviewerwindow.cpp | |
| parent | 60aa61e1cc5d3c42f54368a2b0b9eccfe5d315ff (diff) | |
Break name tag code out into LLHUDNameTag
Start by duplicating the LLHUDText code, then stripping out
functionality that only needs to exist in one place (like
force-based juggling of name tag positions)
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index ea1afafe85..16b8711561 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -120,6 +120,7 @@ #include "llglheaders.h" #include "lltooltip.h" #include "llhudmanager.h" +#include "llhudobject.h" #include "llhudview.h" #include "llimagebmp.h" #include "llimagej2c.h" @@ -1902,7 +1903,7 @@ void LLViewerWindow::reshape(S32 width, S32 height) // clear font width caches if (display_scale_changed) { - LLHUDText::reshape(); + LLHUDObject::reshapeAll(); } sendShapeToSim(); @@ -4132,7 +4133,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei send_agent_pause(); //rescale fonts initFonts(scale_factor); - LLHUDText::reshape(); + LLHUDObject::reshapeAll(); } S32 output_buffer_offset_y = 0; @@ -4261,7 +4262,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei if (high_res) { initFonts(1.f); - LLHUDText::reshape(); + LLHUDObject::reshapeAll(); } // Pre-pad image to number of pixels such that the line length is a multiple of 4 bytes (for BMP encoding) |