aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolbar.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:27 -0500
committerJacek Antonelli2008-08-15 23:45:27 -0500
commita8a62201ba762e98dff92cf49033e577fc34d8d4 (patch)
tree11f8513c5cdc222f2fac0c93eb724c089803c200 /linden/indra/newview/lltoolbar.h
parentSecond Life viewer sources 1.18.6.4-RC (diff)
downloadmeta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.zip
meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.gz
meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.bz2
meta-impy-a8a62201ba762e98dff92cf49033e577fc34d8d4.tar.xz
Second Life viewer sources 1.19.0.0
Diffstat (limited to 'linden/indra/newview/lltoolbar.h')
-rw-r--r--linden/indra/newview/lltoolbar.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/linden/indra/newview/lltoolbar.h b/linden/indra/newview/lltoolbar.h
index c033240..d42d7bb 100644
--- a/linden/indra/newview/lltoolbar.h
+++ b/linden/indra/newview/lltoolbar.h
@@ -12,12 +12,12 @@
12 * ("GPL"), unless you have obtained a separate licensing agreement 12 * ("GPL"), unless you have obtained a separate licensing agreement
13 * ("Other License"), formally executed by you and Linden Lab. Terms of 13 * ("Other License"), formally executed by you and Linden Lab. Terms of
14 * the GPL can be found in doc/GPL-license.txt in this distribution, or 14 * the GPL can be found in doc/GPL-license.txt in this distribution, or
15 * online at http://secondlife.com/developers/opensource/gplv2 15 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
16 * 16 *
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlife.com/developers/opensource/flossexception 20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 21 *
22 * By copying, modifying or distributing this software, you acknowledge 22 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 23 * that you have read and understood your obligations described above,
@@ -47,7 +47,7 @@ class LLToolBar
47: public LLPanel 47: public LLPanel
48{ 48{
49public: 49public:
50 LLToolBar(const std::string& name, const LLRect& rect ); 50 LLToolBar();
51 ~LLToolBar(); 51 ~LLToolBar();
52 52
53 /*virtual*/ BOOL postBuild(); 53 /*virtual*/ BOOL postBuild();
@@ -70,7 +70,7 @@ public:
70 void refresh(); 70 void refresh();
71 71
72 // callbacks 72 // callbacks
73 static void onClickCommunicate(void*); 73 static void onClickCommunicate(LLUICtrl*, void*);
74 static void onClickChat(void* data); 74 static void onClickChat(void* data);
75 static void onClickAppearance(void* data); 75 static void onClickAppearance(void* data);
76 static void onClickClothing(void* data); 76 static void onClickClothing(void* data);
@@ -86,8 +86,13 @@ public:
86 static F32 sInventoryAutoOpenTime; 86 static F32 sInventoryAutoOpenTime;
87 87
88private: 88private:
89 void updateCommunicateList();
90
91
92private:
89 BOOL mInventoryAutoOpen; 93 BOOL mInventoryAutoOpen;
90 LLFrameTimer mInventoryAutoOpenTimer; 94 LLFrameTimer mInventoryAutoOpenTimer;
95 S32 mNumUnreadIMs;
91#if LL_DARWIN 96#if LL_DARWIN
92 LLFakeResizeHandle *mResizeHandle; 97 LLFakeResizeHandle *mResizeHandle;
93#endif // LL_DARWIN 98#endif // LL_DARWIN