diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-07-14 12:14:07 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-07-14 12:14:07 -0700 |
| commit | 6a3f8068837311b841acea36b904f399424c20df (patch) | |
| tree | d56a2cbaa58e28ec9242d1e6b989a02c63c92915 /indra/newview/llmediactrl.cpp | |
| parent | e17c7e6d24d5a25e4c0544ca2bc25fbc0c29d161 (diff) | |
| parent | d668270c13fcad8ae6e0fdfdf063a16be6083243 (diff) | |
merge
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
| -rw-r--r-- | indra/newview/llmediactrl.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 03ccabc994..1eb786f433 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -1164,3 +1164,12 @@ void LLMediaCtrl::hideNotification() mWindowShade->hide(); } } + +void LLMediaCtrl::setTrustedContent(bool trusted) +{ + mTrusted = trusted; + if (mMediaSource) + { + mMediaSource->setTrustedBrowser(trusted); + } +} |