From c2b227c93973edc786c3f42772e06cd1760b610e Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Thu, 12 Nov 2009 14:28:57 +0000 Subject: more inching towards outgoing call popup goodness... --- indra/newview/llimview.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'indra') diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 9c8365930c..9175d0c91c 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1119,18 +1119,6 @@ void LLOutgoingCallDialog::onOpen(const LLSD& key) childSetTextArg("leaving", "[CURRENT_CHAT]", getString("localchat")); } - // dock the dialog to the sys well, where other sys messages appear - setDockControl(new LLDockControl(LLBottomTray::getInstance()->getSysWell(), - this, getDockTongue(), LLDockControl::TOP, - boost::bind(&LLOutgoingCallDialog::getAllowedRect, this, _1))); -} - -BOOL LLOutgoingCallDialog::postBuild() -{ - BOOL success = LLDockableFloater::postBuild(); - - LLSD callee_id = mPayload["other_user_id"]; - std::string callee_name = mPayload["session_name"].asString(); if (callee_name == "anonymous") { @@ -1139,10 +1127,21 @@ BOOL LLOutgoingCallDialog::postBuild() setTitle(callee_name); + LLSD callee_id = mPayload["other_user_id"]; childSetTextArg("calling", "[CALLEE_NAME]", callee_name); LLAvatarIconCtrl* icon = getChild("avatar_icon"); icon->setValue(callee_id); + // dock the dialog to the sys well, where other sys messages appear + setDockControl(new LLDockControl(LLBottomTray::getInstance()->getSysWell(), + this, getDockTongue(), LLDockControl::TOP, + boost::bind(&LLOutgoingCallDialog::getAllowedRect, this, _1))); +} + +BOOL LLOutgoingCallDialog::postBuild() +{ + BOOL success = LLDockableFloater::postBuild(); + //childSetAction("Reject", onReject, this); return success; -- cgit v1.2.3