diff options
author | Jacek Antonelli | 2008-08-15 23:44:59 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:59 -0500 |
commit | a408bac29378072fbf36864164149458c978cfcc (patch) | |
tree | 67feccf1a5d3816611ba48d6762f86f0f7f4b1f6 /linden/indra/newview/llhudicon.cpp | |
parent | Second Life viewer sources 1.17.0.12 (diff) | |
download | meta-impy-a408bac29378072fbf36864164149458c978cfcc.zip meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.gz meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.bz2 meta-impy-a408bac29378072fbf36864164149458c978cfcc.tar.xz |
Second Life viewer sources 1.17.1.0
Diffstat (limited to 'linden/indra/newview/llhudicon.cpp')
-rw-r--r-- | linden/indra/newview/llhudicon.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/newview/llhudicon.cpp b/linden/indra/newview/llhudicon.cpp index 93e730e..15988fa 100644 --- a/linden/indra/newview/llhudicon.cpp +++ b/linden/indra/newview/llhudicon.cpp | |||
@@ -65,7 +65,8 @@ LLHUDIcon::LLHUDIcon(const U8 type) : | |||
65 | LLHUDObject(type), | 65 | LLHUDObject(type), |
66 | mImagep(NULL), | 66 | mImagep(NULL), |
67 | mPickID(0), | 67 | mPickID(0), |
68 | mScale(0.1f) | 68 | mScale(0.1f), |
69 | mHidden(FALSE) | ||
69 | { | 70 | { |
70 | sIconInstances.push_back(this); | 71 | sIconInstances.push_back(this); |
71 | } | 72 | } |
@@ -81,6 +82,9 @@ void LLHUDIcon::renderIcon(BOOL for_select) | |||
81 | LLGLDepthTest gls_depth(GL_TRUE); | 82 | LLGLDepthTest gls_depth(GL_TRUE); |
82 | LLGLState no_texture(GL_TEXTURE_2D, for_select ? FALSE : TRUE); | 83 | LLGLState no_texture(GL_TEXTURE_2D, for_select ? FALSE : TRUE); |
83 | 84 | ||
85 | if (mHidden) | ||
86 | return; | ||
87 | |||
84 | if (mSourceObject.isNull() || mImagep.isNull()) | 88 | if (mSourceObject.isNull() || mImagep.isNull()) |
85 | { | 89 | { |
86 | markDead(); | 90 | markDead(); |