diff options
author | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
commit | d373dcc7cbed5fdea72c6b71a5594e4e85549b43 (patch) | |
tree | 140e20f48db5dc4d7842f05ef2c24ef9e6fc3238 /indra/newview/llhudmanager.h | |
parent | c78f99b0b3b4b9ac99a69b63315e821d89a89a3b (diff) |
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
Diffstat (limited to 'indra/newview/llhudmanager.h')
-rw-r--r-- | indra/newview/llhudmanager.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/indra/newview/llhudmanager.h b/indra/newview/llhudmanager.h index 4cb22a2477..dd519554f9 100644 --- a/indra/newview/llhudmanager.h +++ b/indra/newview/llhudmanager.h @@ -30,11 +30,6 @@ public: LLHUDManager(); ~LLHUDManager(); - void toggleShowPhysical(const BOOL show_physical); - void showJoints(LLDynamicArray < LLViewerObject* > *object_list); - void clearJoints(); - BOOL getShowPhysical() const; - LLHUDEffect *createViewerEffect(const U8 type, BOOL send_to_sim = TRUE, BOOL originated_here = TRUE); void updateEffects(); @@ -47,12 +42,7 @@ public: static LLColor4 sChildColor; protected: - LLDynamicArrayPtr<LLPointer<LLHUDObject> > mHUDJoints; - LLDynamicArrayPtr<LLPointer<LLHUDObject> > mHUDSelectedJoints; LLDynamicArrayPtr<LLPointer<LLHUDEffect> > mHUDEffects; - - // ALT held down this frame? - BOOL mShowPhysical; }; extern LLHUDManager *gHUDManager; |