diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/newview/llhudview.cpp | |
parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/newview/llhudview.cpp')
-rw-r--r-- | indra/newview/llhudview.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llhudview.cpp b/indra/newview/llhudview.cpp index 198514ce0c..6f22a68327 100644 --- a/indra/newview/llhudview.cpp +++ b/indra/newview/llhudview.cpp @@ -41,7 +41,6 @@ // viewer includes #include "llagent.h" #include "llcallingcard.h" -#include "llcolorscheme.h" #include "llviewercontrol.h" #include "llfloaterworldmap.h" #include "llworldmapview.h" @@ -55,10 +54,12 @@ const S32 HUD_ARROW_SIZE = 32; LLHUDView::LLHUDView() : LLPanel() -{ } +{ +} LLHUDView::~LLHUDView() -{ } +{ +} // virtual void LLHUDView::draw() |