diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-24 19:33:44 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-24 19:33:44 -0700 |
| commit | 9ba474774706f8b3af39a46ac57dd94c5e563a0e (patch) | |
| tree | fa54859fcac9ec888f7affa2df2eec4ecc26ee1a /indra/newview/llimview.h | |
| parent | 5b0a1ac026e0ca06526cc0c03325b223a051ea63 (diff) | |
| parent | 71bc6007471f3303c0ddf4ab7fd8f57ec52b3f56 (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 93b604d36a..33c7ae9e54 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -491,7 +491,7 @@ class LLCallDialog : public LLDockableFloater { public: LLCallDialog(const LLSD& payload); - ~LLCallDialog(); + virtual ~LLCallDialog(); virtual BOOL postBuild(); @@ -519,6 +519,9 @@ protected: void setIcon(const LLSD& session_id, const LLSD& participant_id); LLSD mPayload; + +private: + LLDockControl::DocAt getDockControlPos(); }; class LLIncomingCallDialog : public LLCallDialog |