From 7b2b36ec7813ba7536b1d2940e993c8d86fc99f9 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Fri, 26 Feb 2010 10:08:03 +0200 Subject: =?UTF-8?q?fixed=20major=20EXT-5746=20=E2=80=9CVoice=20notificatio?= =?UTF-8?q?ns=20appear=20undocked=20in=20the=20top=20left=20corner=20of=20?= =?UTF-8?q?viewport=E2=80=9D,=20made=20LLCallFloater=20and=20LLCallDialog?= =?UTF-8?q?=20force=20docked=20state=20when=20created;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llcallfloater.cpp | 3 +++ indra/newview/llimview.cpp | 2 ++ 2 files changed, 5 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 76e058a1c3..c8552de66a 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -115,6 +115,9 @@ LLCallFloater::LLCallFloater(const LLSD& key) mFactoryMap["non_avatar_caller"] = LLCallbackMap(create_non_avatar_caller, NULL); LLVoiceClient::getInstance()->addObserver(this); LLTransientFloaterMgr::getInstance()->addControlView(this); + + // force docked state since this floater doesn't save it between recreations + setDocked(true); } LLCallFloater::~LLCallFloater() diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index faddffe0fc..e87399abab 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1473,6 +1473,8 @@ LLCallDialog::LLCallDialog(const LLSD& payload) mLifetime(DEFAULT_LIFETIME) { setAutoFocus(FALSE); + // force docked state since this floater doesn't save it between recreations + setDocked(true); } void LLCallDialog::getAllowedRect(LLRect& rect) -- cgit v1.2.3