diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 08:04:56 +0000 |
| commit | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (patch) | |
| tree | 4a505c1e0919af52800b3ffb3eaf135e7d6f9ce6 /indra/newview/lltoolbar.h | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
Diffstat (limited to 'indra/newview/lltoolbar.h')
| -rw-r--r-- | indra/newview/lltoolbar.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/indra/newview/lltoolbar.h b/indra/newview/lltoolbar.h index 094d016e39..954c6270a6 100644 --- a/indra/newview/lltoolbar.h +++ b/indra/newview/lltoolbar.h @@ -37,12 +37,7 @@ #include "llframetimer.h" -// "Constants" loaded from settings.xml at start time -extern S32 TOOL_BAR_HEIGHT; - -#if LL_DARWIN - class LLFakeResizeHandle; -#endif // LL_DARWIN +class LLResizeHandle; class LLToolBar : public LLPanel @@ -71,17 +66,7 @@ public: void refresh(); // callbacks - static void onClickCommunicate(LLUICtrl*, void*); - static void onClickChat(void* data); - static void onClickAppearance(void* data); - static void onClickFly(void*); - static void onClickSit(void*); - static void onClickSnapshot(void* data); - static void onClickDirectory(void* data); - static void onClickBuild(void* data); - static void onClickRadar(void* data); - static void onClickMap(void* data); - static void onClickInventory(void* data); + static void onClickCommunicate(LLUICtrl*, const LLSD&); static F32 sInventoryAutoOpenTime; @@ -94,7 +79,7 @@ private: LLFrameTimer mInventoryAutoOpenTimer; S32 mNumUnreadIMs; #if LL_DARWIN - LLFakeResizeHandle *mResizeHandle; + LLResizeHandle *mResizeHandle; #endif // LL_DARWIN }; |