diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2011-06-01 15:44:46 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2011-06-01 15:44:46 -0700 |
commit | 926a9dcb58106650e8efda7a8a32b58bb6fcbd9e (patch) | |
tree | 6d569bbcee6f8448f3307149e4394e9dee9b20b8 /indra/newview/llbottomtray.h | |
parent | fe9eccdbae9af3c61bff4637c1a61cdc09068a32 (diff) | |
parent | 5093f604cb04e8de54750498fd7fa01538f4b22c (diff) |
merge
Diffstat (limited to 'indra/newview/llbottomtray.h')
-rw-r--r-- | indra/newview/llbottomtray.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index d9c95d82e5..62718531ef 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -39,6 +39,7 @@ class LLIMChiclet; class LLBottomTrayLite; class LLLayoutPanel; class LLMenuGL; +class LLNearbyChatBarListener; // Build time optimization, generate once in .cpp file #ifndef LLBOTTOMTRAY_CPP @@ -555,6 +556,9 @@ protected: * Image used to show position where dragged button will be dropped. */ LLUIImage* mImageDragIndication; + + // We want only one LLNearbyChatBarListener object, so it's tied to this singleton + boost::shared_ptr<LLNearbyChatBarListener> mListener; }; #endif // LL_LLBOTTOMPANEL_H |