diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2009-08-27 19:00:18 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2009-08-27 19:00:18 +0000 |
| commit | 745845f79987e4b4ab7f5728746a0eda8898930f (patch) | |
| tree | f10efd4a638a6a7eda92a960cdb97e5256ff736a /indra/newview/llhudview.cpp | |
| parent | 71344b233d5ae3d5262a492b636af04544952611 (diff) | |
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
Diffstat (limited to 'indra/newview/llhudview.cpp')
| -rw-r--r-- | indra/newview/llhudview.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llhudview.cpp b/indra/newview/llhudview.cpp index 0a6938f4f8..027cd2ab07 100644 --- a/indra/newview/llhudview.cpp +++ b/indra/newview/llhudview.cpp @@ -46,14 +46,18 @@ #include "lltracker.h" #include "llviewercamera.h" #include "llui.h" +#include "lluictrlfactory.h" LLHUDView *gHUDView = NULL; const S32 HUD_ARROW_SIZE = 32; -LLHUDView::LLHUDView() -: LLPanel() + + +LLHUDView::LLHUDView(const LLRect& r) { + LLUICtrlFactory::getInstance()->buildPanel(this, "panel_hud.xml"); + setShape(r, true); } LLHUDView::~LLHUDView() @@ -64,6 +68,7 @@ LLHUDView::~LLHUDView() void LLHUDView::draw() { LLTracker::drawHUDArrow(); + LLView::draw(); } @@ -89,4 +94,3 @@ BOOL LLHUDView::handleMouseDown(S32 x, S32 y, MASK mask) } return LLView::handleMouseDown(x, y, mask); } - |