diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-01 17:52:30 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-01 17:52:30 +0000 |
| commit | 1713a3552b7017cbf781f2effd448f2e8cfb9372 (patch) | |
| tree | 1ffbfd1155ee84a9db937ba9cf1520c0248e6c92 /indra/newview/lloutputmonitorctrl.cpp | |
| parent | cf9814bc05f17e233e5d03e63fc2e519512b3e58 (diff) | |
merge -r 1879-1884 https://svn.aws.productengine.com/secondlife/pe/stable-2
* Major Bugs: EXT-1248 EXT-1127 EXT-844 EXT-1160
* Changes: EXT-1139 (places context menu)
Diffstat (limited to 'indra/newview/lloutputmonitorctrl.cpp')
| -rw-r--r-- | indra/newview/lloutputmonitorctrl.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp index 6e1dc6940e..d9cdf2e04f 100644 --- a/indra/newview/lloutputmonitorctrl.cpp +++ b/indra/newview/lloutputmonitorctrl.cpp @@ -129,7 +129,7 @@ void LLOutputMonitorCtrl::draw() const F32 LEVEL_1 = LLVoiceClient::OVERDRIVEN_POWER_LEVEL * 2.f / 3.f; const F32 LEVEL_2 = LLVoiceClient::OVERDRIVEN_POWER_LEVEL; - if (mIsParentVisible && getVisible() && mAutoUpdate && !mIsMuted && mSpeakerId.notNull()) + if (getVisible() && mAutoUpdate && !mIsMuted && mSpeakerId.notNull()) { setPower(gVoiceClient->getCurrentPower(mSpeakerId)); setIsTalking(gVoiceClient->getIsSpeaking(mSpeakerId)); @@ -220,12 +220,6 @@ void LLOutputMonitorCtrl::draw() gl_rect_2d(0, monh, monw, 0, sColorBound, FALSE); } -void LLOutputMonitorCtrl::handleVisibilityChange(BOOL new_visibility) -{ - mIsParentVisible = new_visibility; - LLView::handleVisibilityChange(new_visibility); -} - void LLOutputMonitorCtrl::setSpeakerId(const LLUUID& speaker_id) { if (speaker_id.isNull()) return; |