diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-14 16:49:11 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-14 16:49:11 -0700 |
| commit | fc2bd1cce2e6c213fa682b9768d435a4e394a95e (patch) | |
| tree | dba1adbac8c96a093a0dfd5f54b7eccd65bf2233 /indra/newview/llimview.cpp | |
| parent | 4c6f04c50225a4a5494974c3a6e13bee76cfbb6f (diff) | |
| parent | cf98cdf69f481dd473363d4a80a80f27e96f87e8 (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 4602533736..64d5152ebe 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -46,7 +46,6 @@ #include "llagentui.h" #include "llappviewer.h" #include "llavatariconctrl.h" -#include "llbottomtray.h" #include "llcallingcard.h" #include "llchat.h" #include "llimfloater.h" @@ -1675,24 +1674,11 @@ LLCallDialog::~LLCallDialog() LLUI::removePopup(this); } -void LLCallDialog::getAllowedRect(LLRect& rect) -{ - rect = gViewerWindow->getWorldViewRectScaled(); -} - BOOL LLCallDialog::postBuild() { if (!LLDockableFloater::postBuild()) return FALSE; - // dock the dialog to the Speak Button, where other sys messages appear - LLView *anchor_panel = LLBottomTray::getInstance()->getChild<LLView>("speak_panel"); - - setDockControl(new LLDockControl( - anchor_panel, this, - getDockTongue(), LLDockControl::TOP, - boost::bind(&LLCallDialog::getAllowedRect, this, _1))); - return TRUE; } |