diff options
author | Andrew Meadows <andrew@lindenlab.com> | 2010-11-16 07:01:11 -0800 |
---|---|---|
committer | Andrew Meadows <andrew@lindenlab.com> | 2010-11-16 07:01:11 -0800 |
commit | 807007649a32c5276f31c5f73d6fade7d059ce07 (patch) | |
tree | 5730fa254ab3938a2acd4329921a57a551018ad1 /indra/newview/llhudobject.h | |
parent | 92a8d93b0d3084c1ccd4fb9cccc285bc14d01404 (diff) | |
parent | e8e1d7e629b9a4a65cde766ed81334140a749428 (diff) |
merge
Diffstat (limited to 'indra/newview/llhudobject.h')
-rw-r--r-- | indra/newview/llhudobject.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h index 97145b9a84..33e6394445 100644 --- a/indra/newview/llhudobject.h +++ b/indra/newview/llhudobject.h @@ -36,7 +36,7 @@ #include "v4color.h" #include "v3math.h" #include "v3dmath.h" -#include "lldrawpool.h" +#include "lldrawpool.h" // TODO: eliminate, unused below #include <list> class LLViewerCamera; @@ -71,6 +71,9 @@ public: static void renderAllForSelect(); static void renderAllForTimer(); + // Some objects may need to update when window shape changes + static void reshapeAll(); + static void cleanupHUDObjects(); enum @@ -91,7 +94,8 @@ public: LL_HUD_EFFECT_EDIT, LL_HUD_EFFECT_LOOKAT, LL_HUD_EFFECT_POINTAT, - LL_HUD_EFFECT_VOICE_VISUALIZER // Ventrella + LL_HUD_EFFECT_VOICE_VISUALIZER, // Ventrella + LL_HUD_NAME_TAG }; protected: static void sortObjects(); @@ -100,7 +104,6 @@ protected: ~LLHUDObject(); virtual void render() = 0; - virtual void renderForSelect() {}; virtual void renderForTimer() {}; protected: @@ -108,7 +111,6 @@ protected: BOOL mDead; BOOL mVisible; LLVector3d mPositionGlobal; - BOOL mOnHUDAttachment; LLPointer<LLViewerObject> mSourceObject; LLPointer<LLViewerObject> mTargetObject; |