diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:22:45 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:22:45 -0400 |
commit | 31edad0a226a14b5b87fe364c629f8450bda567c (patch) | |
tree | e03ed820a759cd5d5c5f4f930762f73b0fe4cf24 /indra/newview/llhudobject.h | |
parent | b6e6ba224620e0b122062c88f40295c10ce8db2d (diff) | |
parent | 742dd75751f65224d80eb4f7d20daf5a21776c5f (diff) |
merge changes for storm-357
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(); |