diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-16 15:42:33 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-16 15:42:33 -0800 |
| commit | 0e234edcc67ecf534df15f088158ef236f6de102 (patch) | |
| tree | 9013ecc90f0fde4e87f45c44d27b73f5197a1911 /indra/newview/llviewermedia.h | |
| parent | c6a8d9a7e71a22290ac8db63828f3c6fdd018ffd (diff) | |
EXT-5270: Implement "dynamic" controls based on the selected item in Nearby Media
Review #112
This change adds controls that change state based on the selection in the nearby media panel. There are basically 3 sets:
- Time-based
- Web-based ("Normal")
- Disabled
Again, these change based on what you've got selected in the panel
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index ec25744fa2..9dbffa78b3 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -230,7 +230,7 @@ public: void setMediaFailed(bool val) { mMediaSourceFailed = val; } void resetPreviousMediaState(); - void setDisabled(bool disabled); + void setDisabled(bool disabled, bool forcePlayOnEnable = false); bool isMediaDisabled() const { return mIsDisabled; }; void setInNearbyMediaList(bool in_list) { mInNearbyMediaList = in_list; } |