summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinput.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-02-03 15:18:34 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-02-03 15:18:34 +0200
commite0727702ea00c975361cf94b4d2903a9fec6f6f8 (patch)
treed64f1cf4ebf58a08fb7fc197206ce31fab2aa115 /indra/newview/llviewerinput.cpp
parentc5195905b8c9b30a2b3aab652aa9828e9825c42f (diff)
parente58b5263598368b6dec4a836c72c69b50d701911 (diff)
Merge branch 'DRTVWR-501' into trunk
Diffstat (limited to 'indra/newview/llviewerinput.cpp')
-rw-r--r--indra/newview/llviewerinput.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp
index 0718a27696..af0d8cb1fd 100644
--- a/indra/newview/llviewerinput.cpp
+++ b/indra/newview/llviewerinput.cpp
@@ -783,16 +783,16 @@ bool toggle_sit(EKeystate s)
bool toggle_pause_media(EKeystate s) // analogue of play/pause button in top bar
{
if (KEYSTATE_DOWN != s) return true;
- bool pause = LLViewerMedia::isAnyMediaPlaying();
- LLViewerMedia::setAllMediaPaused(pause);
+ bool pause = LLViewerMedia::getInstance()->isAnyMediaPlaying();
+ LLViewerMedia::getInstance()->setAllMediaPaused(pause);
return true;
}
bool toggle_enable_media(EKeystate s)
{
if (KEYSTATE_DOWN != s) return true;
- bool pause = LLViewerMedia::isAnyMediaPlaying() || LLViewerMedia::isAnyMediaShowing();
- LLViewerMedia::setAllMediaEnabled(!pause);
+ bool pause = LLViewerMedia::getInstance()->isAnyMediaPlaying() || LLViewerMedia::getInstance()->isAnyMediaShowing();
+ LLViewerMedia::getInstance()->setAllMediaEnabled(!pause);
return true;
}