diff options
author | prep linden <prep@lindenlab.com> | 2011-06-07 16:54:13 -0400 |
---|---|---|
committer | prep linden <prep@lindenlab.com> | 2011-06-07 16:54:13 -0400 |
commit | c4c8e13ac5f555a5b9257582bcc8c3494be1de5d (patch) | |
tree | 897327da900fb002065b1e2f01f213333115d556 /indra/newview/llbottomtray.h | |
parent | dbd619508ba45292c2cebe096494c28e74941643 (diff) | |
parent | 017da5453e92170ba37e93f364f30a9ccfbff202 (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 |