diff options
| author | Richard Linden <none@none> | 2010-06-03 14:15:11 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-03 14:15:11 -0700 |
| commit | f79ac664dd6eead75368ced40110b6f0474aa92e (patch) | |
| tree | b24c616c96d32e0b20c5dd0a217701922f884ee6 /indra/newview/llhudobject.h | |
| parent | e2b8c1c699f75e234776beda939205a247fb1bc3 (diff) | |
| parent | 56e0d59ebcc98515c24f7706569b6e7362981432 (diff) | |
merge
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 d304ac41af..a370b31a20 100644 --- a/indra/newview/llhudobject.h +++ b/indra/newview/llhudobject.h @@ -42,7 +42,7 @@ #include "v4color.h" #include "v3math.h" #include "v3dmath.h" -#include "lldrawpool.h" +#include "lldrawpool.h" // TODO: eliminate, unused below #include <list> class LLViewerCamera; @@ -76,6 +76,9 @@ public: static void renderAll(); static void renderAllForSelect(); + // Some objects may need to update when window shape changes + static void reshapeAll(); + static void cleanupHUDObjects(); enum @@ -96,7 +99,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(); @@ -112,7 +116,6 @@ protected: BOOL mDead; BOOL mVisible; LLVector3d mPositionGlobal; - BOOL mOnHUDAttachment; LLPointer<LLViewerObject> mSourceObject; LLPointer<LLViewerObject> mTargetObject; |