diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-08 14:00:08 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-08 14:00:08 -0500 |
| commit | 4b36aeb9736fb71de7087063444652c9d87f370c (patch) | |
| tree | 90741aaadb16d5f844d073222e5c56987f283a56 /indra/newview/llimview.h | |
| parent | 09179d1346ccf2fa07b2dec6a72592beb3bd262f (diff) | |
| parent | 28c26cb491305525fb3f24ec2ef3bcb9b1ab8c5f (diff) | |
merge
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 93b604d36a..b1be26a169 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -491,14 +491,16 @@ class LLCallDialog : public LLDockableFloater { public: LLCallDialog(const LLSD& payload); - ~LLCallDialog(); + virtual ~LLCallDialog(); virtual BOOL postBuild(); + void dockToToolbarButton(const std::string& toolbarButtonName); + // check timer state /*virtual*/ void draw(); /*virtual*/ void onOpen(const LLSD& key); - + protected: // lifetime timer for a notification LLTimer mLifetimeTimer; @@ -519,6 +521,9 @@ protected: void setIcon(const LLSD& session_id, const LLSD& participant_id); LLSD mPayload; + +private: + LLDockControl::DocAt getDockControlPos(const std::string& toolbarButtonName); }; class LLIncomingCallDialog : public LLCallDialog |