diff options
| author | callum <none@none> | 2011-10-14 15:22:10 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-10-14 15:22:10 -0700 |
| commit | bfda156022df272cda390e22dd31937b74eceb39 (patch) | |
| tree | 202cf50815a6304d4262955a1c097d80641452b5 /indra/newview/llimview.cpp | |
| parent | baed4d8f4338e8788d1948af4c49d01fc8f32a98 (diff) | |
| parent | bdf6363e6aa4216913607e83bfc5e159f2535407 (diff) | |
merge with head
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; } |