From ccb1d2b1e43369803cf9ab1ffc7deefbac2db8fc Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 10 Sep 2009 03:12:12 +0000 Subject: merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3 Fixes: EXT-825 EXT-893 EXT-889 EXT-88 --- indra/newview/llchiclet.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llchiclet.cpp') diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 9ce194c712..e5acf62189 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -670,6 +670,10 @@ LLChicletPanel::LLChicletPanel(const Params&p) LLPanel::Params panel_params; mScrollArea = LLUICtrlFactory::create(panel_params,this); + + // important for Show/Hide Camera and Move controls menu in bottom tray to work properly + mScrollArea->setMouseOpaque(false); + addChild(mScrollArea); } -- cgit v1.2.3 From 7df79382a075646a51f21bed0d7f8de883fc3608 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 11 Sep 2009 23:50:59 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3 * Bugs: EXT-888 EXT-866 EXT-861 EXT-858 EXT-864 EXT-875 EXT-884 EXT-718 EXT-786 EXT-885 EXT-910 EXT-845 EXT-312 EXT-823 EXT-868 * New Development: EXT-748 EXT-863 EXT-835 QA: Please test Recent List to verify it has no troubles. --- indra/newview/llchiclet.cpp | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'indra/newview/llchiclet.cpp') diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index e5acf62189..42ed783f94 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -1140,6 +1140,8 @@ LLTalkButton::LLTalkButton(const Params& p) LLOutputMonitorCtrl::Params monitor_params = p.monitor; monitor_params.draw_border(false); monitor_params.rect(monitor_rect); + monitor_params.auto_update(true); + monitor_params.speaker_id(gAgentID); mOutputMonitor = LLUICtrlFactory::create(monitor_params); mSpeakBtn->addChild(mOutputMonitor); @@ -1151,17 +1153,6 @@ LLTalkButton::~LLTalkButton() { } -void LLTalkButton::draw() -{ - // Always provide speaking feedback. User can trigger speaking - // with keyboard or middle-mouse shortcut. - mOutputMonitor->setPower(gVoiceClient->getCurrentPower(gAgent.getID())); - mOutputMonitor->setIsTalking( gVoiceClient->getUserPTTState() ); - mSpeakBtn->setToggleState( gVoiceClient->getUserPTTState() ); - - LLUICtrl::draw(); -} - void LLTalkButton::setSpeakBtnToggleState(bool state) { mSpeakBtn->setToggleState(state); @@ -1198,13 +1189,14 @@ void LLTalkButton::onClick_ShowBtn() rect.setLeftTopAndSize(x, y, mPrivateCallPanel->getRect().getWidth(), mPrivateCallPanel->getRect().getHeight()); mPrivateCallPanel->setRect(rect); - LLAvatarListItem::Params p; - p.buttons.status = true; - p.buttons.info = true; - p.buttons.profile = false; - p.buttons.locator = true; - mPrivateCallPanel->addItem(new LLAvatarListItem(p)); + LLAvatarListItem* item = new LLAvatarListItem(); + item->showStatus(true); + item->showInfoBtn(true); + item->showSpeakingIndicator(true); + item->reshape(mPrivateCallPanel->getRect().getWidth(), item->getRect().getHeight(), FALSE); + + mPrivateCallPanel->addItem(item); mPrivateCallPanel->setVisible(TRUE); mPrivateCallPanel->setFrontmost(TRUE); -- cgit v1.2.3