diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-21 06:59:13 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 06:59:13 -0400 |
commit | 8e0ea2fb7271b6d559ec751d47eb8b2992d4611d (patch) | |
tree | 0368edab036f87a93a21bcd0fdd635dd749d6fc0 /indra/newview/llhudobject.h | |
parent | 2453ccbd3ee10a4f845e98fb51aac6c1e4bca5a5 (diff) | |
parent | f122d0939060fd597820a71d85a5c0d839bcff5d (diff) |
merge changes for storm-659
Diffstat (limited to 'indra/newview/llhudobject.h')
-rw-r--r-- | indra/newview/llhudobject.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h index 33e6394445..2f7a98c86c 100644 --- a/indra/newview/llhudobject.h +++ b/indra/newview/llhudobject.h @@ -95,7 +95,8 @@ public: LL_HUD_EFFECT_LOOKAT, LL_HUD_EFFECT_POINTAT, LL_HUD_EFFECT_VOICE_VISUALIZER, // Ventrella - LL_HUD_NAME_TAG + LL_HUD_NAME_TAG, + LL_HUD_EFFECT_BLOB }; protected: static void sortObjects(); |