diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-26 10:08:03 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-26 10:08:03 +0200 |
| commit | 7b2b36ec7813ba7536b1d2940e993c8d86fc99f9 (patch) | |
| tree | b945b46fa7f148f0d53d530194054947242edc8a /indra | |
| parent | a3e549639130eec752d99db767eb1992cc3a0661 (diff) | |
fixed major EXT-5746 “Voice notifications appear undocked in the top left corner of
viewport”,
made LLCallFloater and LLCallDialog force docked state when created;
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llimview.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
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) |