summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelnearbymedia.cpp
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-12-02 09:22:27 -0500
committerJonathan Yap <none@none>2011-12-02 09:22:27 -0500
commit7226b23366805ae259000df25a622fc98a722d14 (patch)
treecfaa4453aa67a4f81cd29a922a403c1b05144446 /indra/newview/llpanelnearbymedia.cpp
parenta4cb08ae5d20416e21bbc70540527097495af887 (diff)
STORM-591 Made mininum fade time 0.01 seconds to prevent divide by zero and negative fade times.
Rewrote two blocks of code to eliminate early returns.
Diffstat (limited to 'indra/newview/llpanelnearbymedia.cpp')
-rw-r--r--indra/newview/llpanelnearbymedia.cpp20
1 files changed, 16 insertions, 4 deletions
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
index 53fc64f089..c01adc3c35 100644
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -808,14 +808,26 @@ bool LLPanelNearByMedia::setDisabled(const LLUUID &row_id, bool disabled)
{
if (row_id == PARCEL_AUDIO_LIST_ITEM_UUID)
{
- if (disabled) onClickParcelAudioStop();
- else onClickParcelAudioPlay();
+ if (disabled)
+ {
+ onClickParcelAudioStop();
+ }
+ else
+ {
+ onClickParcelAudioPlay();
+ }
return true;
}
else if (row_id == PARCEL_MEDIA_LIST_ITEM_UUID)
{
- if (disabled) onClickDisableParcelMedia();
- else onClickEnableParcelMedia();
+ if (disabled)
+ {
+ onClickDisableParcelMedia();
+ }
+ else
+ {
+ onClickEnableParcelMedia();
+ }
return true;
}
else {