diff options
author | Oz Linden <oz@lindenlab.com> | 2011-10-05 18:02:58 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-10-05 18:02:58 -0400 |
commit | 5f38ec7f92fcea833352cd30797a9d73ef5a041f (patch) | |
tree | 67a35e5cd822b9f630dd72fdc93e4a3749f92735 /indra/llui/lluictrl.h | |
parent | 194bedbb96a6dcfe90d5b731aeca8658c83f2306 (diff) | |
parent | 30480b58db917e48090ae7b3c1427834875d9626 (diff) |
merge changes for storm-1637
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; |