diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 17:41:39 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-09-03 17:41:39 +0100 |
| commit | ffae589843c2977ae7f70de78d84c936e2a91291 (patch) | |
| tree | 497660a88fe55382639dea1b2f3499241127470d /indra/newview/llhudobject.h | |
| parent | 63f2ddf377fa0fc6a666cdc1001289335d86258b (diff) | |
| parent | 25c29d59cf658acec5901c6f06775add10cf0bfd (diff) | |
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
Diffstat (limited to 'indra/newview/llhudobject.h')
| -rw-r--r-- | indra/newview/llhudobject.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h index 97145b9a84..4282ade34d 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(); @@ -108,7 +112,6 @@ protected: BOOL mDead; BOOL mVisible; LLVector3d mPositionGlobal; - BOOL mOnHUDAttachment; LLPointer<LLViewerObject> mSourceObject; LLPointer<LLViewerObject> mTargetObject; |