diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-06-07 17:16:49 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-06-07 17:16:49 -0700 |
| commit | 1361eeae4e4538c175a32d48246897c4659cc26c (patch) | |
| tree | 19687f65cc1c51b3247d0d1cd665b19c1a41a1e4 /indra/newview/llbottomtray.h | |
| parent | bff172b374fa12e646d427e09f2ffac4289ab654 (diff) | |
| parent | cf31723a1a258e0452dd26d9f5eb5fcdac290e05 (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 |