aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llhudobject.h
diff options
context:
space:
mode:
authorJacek Antonelli2010-01-26 13:02:07 -0600
committerJacek Antonelli2010-01-26 14:25:07 -0600
commit6e1e243da8c06ddd6847576c55e134d72ef42491 (patch)
tree3cd1bfbd60d3b92323717afda3fa5a821cf4066c /linden/indra/newview/llhudobject.h
parentChangeLog entry: Several changes to work better on 64bit Linux. (diff)
parentSNOW-413 Potential null pointer exception in multi-slider control (diff)
downloadmeta-impy-6e1e243da8c06ddd6847576c55e134d72ef42491.zip
meta-impy-6e1e243da8c06ddd6847576c55e134d72ef42491.tar.gz
meta-impy-6e1e243da8c06ddd6847576c55e134d72ef42491.tar.bz2
meta-impy-6e1e243da8c06ddd6847576c55e134d72ef42491.tar.xz
Merged bug fixes by Mm Alder and Admiral Admiral.
Diffstat (limited to 'linden/indra/newview/llhudobject.h')
-rw-r--r--linden/indra/newview/llhudobject.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llhudobject.h b/linden/indra/newview/llhudobject.h
index 2cd8abf..84c2f84 100644
--- a/linden/indra/newview/llhudobject.h
+++ b/linden/indra/newview/llhudobject.h
@@ -75,6 +75,7 @@ public:
75 static void updateAll(); 75 static void updateAll();
76 static void renderAll(); 76 static void renderAll();
77 static void renderAllForSelect(); 77 static void renderAllForSelect();
78 static void renderAllForTimer();
78 79
79 static void cleanupHUDObjects(); 80 static void cleanupHUDObjects();
80 81
@@ -106,6 +107,7 @@ protected:
106 107
107 virtual void render() = 0; 108 virtual void render() = 0;
108 virtual void renderForSelect() {}; 109 virtual void renderForSelect() {};
110 virtual void renderForTimer() {};
109 111
110protected: 112protected:
111 U8 mType; 113 U8 mType;