diff options
author | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-10-06 16:39:23 -0400 |
commit | a41ca2c34d291b4eebdeeb4475b512f2a8af5cb1 (patch) | |
tree | e305b00950eb562abec94ce33307b6694ca6ec98 /indra/llui/lluictrl.h | |
parent | fd91f09e19f937cb7e2f779c4e146064415ad427 (diff) | |
parent | 5f38ec7f92fcea833352cd30797a9d73ef5a041f (diff) |
merge fixes for storm-1602 up to latest viewer-development
Diffstat (limited to 'indra/llui/lluictrl.h')
-rw-r--r-- | indra/llui/lluictrl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h index 09bed9b958..8a8b589e9c 100644 --- a/indra/llui/lluictrl.h +++ b/indra/llui/lluictrl.h @@ -301,7 +301,9 @@ protected: static F32 sActiveControlTransparency; static F32 sInactiveControlTransparency; - + + virtual void addInfo(LLSD & info); + private: BOOL mIsChrome; |