diff options
| author | Dmitry Oleshko <doleshko@productengine.com> | 2009-11-27 14:53:38 +0200 |
|---|---|---|
| committer | Dmitry Oleshko <doleshko@productengine.com> | 2009-11-27 14:53:38 +0200 |
| commit | 8b802a69c7c836e179336576df9de04a9cad5de3 (patch) | |
| tree | 28519453f4836b976a7a1dbfa3803813bf8534a9 /indra | |
| parent | e4fd6e41809144056662332db3146cc50b8f5acb (diff) | |
implemented normal sub-task (EXT-2800) Voice calls notification windows and dialogs should be shown/docked over the speak button's chevron
changed dock-control from the SysWell to the SpeakButton for outgoing and incoming voice dialogs
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 1451448b0b..dff339fa63 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1199,7 +1199,7 @@ BOOL LLOutgoingCallDialog::postBuild() childSetAction("Cancel", onCancel, this); // dock the dialog to the sys well, where other sys messages appear - setDockControl(new LLDockControl(LLBottomTray::getInstance()->getSysWell(), + setDockControl(new LLDockControl(LLBottomTray::getInstance()->getChild<LLPanel>("speak_panel"), this, getDockTongue(), LLDockControl::TOP, boost::bind(&LLOutgoingCallDialog::getAllowedRect, this, _1))); @@ -1276,7 +1276,7 @@ void LLIncomingCallDialog::onOpen(const LLSD& key) } // dock the dialog to the sys well, where other sys messages appear - setDockControl(new LLDockControl(LLBottomTray::getInstance()->getSysWell(), + setDockControl(new LLDockControl(LLBottomTray::getInstance()->getChild<LLPanel>("speak_panel"), this, getDockTongue(), LLDockControl::TOP, boost::bind(&LLIncomingCallDialog::getAllowedRect, this, _1))); } |