diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:30:09 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:30:09 +0000 |
commit | 51500f82e23b7deff9a0e1bc23f5bfa40aec1fb9 (patch) | |
tree | 2ed65f1dd0a8404eda670cf1fe2e37769758f74a /indra/newview/llsidetray.h | |
parent | b2b980d6979b10a08b56c10b71c12ae4f9e6ff59 (diff) |
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3
* EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707 EXT-708 EXT-726 EXT-737
Diffstat (limited to 'indra/newview/llsidetray.h')
-rw-r--r-- | indra/newview/llsidetray.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llsidetray.h b/indra/newview/llsidetray.h index b691a42db1..13acbbb659 100644 --- a/indra/newview/llsidetray.h +++ b/indra/newview/llsidetray.h @@ -207,6 +207,9 @@ public: void reshape (S32 width, S32 height, BOOL called_from_parent = TRUE); S32 getTrayWidth(); + void resetPanelRect (); + + protected: LLSideTrayTab* getTab (const std::string& name); @@ -217,9 +220,10 @@ protected: void toggleTabButton (LLSideTrayTab* tab); - void setPanelRect (); + + private: // Implementation of LLDestroyClass<LLSideTray> static void destroyClass() |