From 0b07e057b10baa94233347f1bff7b9dc66ade9bc Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Thu, 28 Nov 2019 00:51:05 +0200
Subject: [PATCH] Buildfix
---
indra/newview/llviewerinput.cpp | 8 ++++----
indra/newview/llviewermedia.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llviewerinput.cpp b/indra/newview/llviewerinput.cpp
index da61a9b39b9..bbaa4f29169 100644
--- a/indra/newview/llviewerinput.cpp
+++ b/indra/newview/llviewerinput.cpp
@@ -785,16 +785,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;
}
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 9467a138f03..a5cde35c886 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -79,7 +79,7 @@ class LLViewerMedia: public LLSingleton<LLViewerMedia>
public:
// String to get/set media autoplay in gSavedSettings
- static const char* AUTO_PLAY_MEDIA_SETTING;
+ static const char* AUTO_PLAY_MEDIA_SETTING;
static const char* SHOW_MEDIA_ON_OTHERS_SETTING;
static const char* SHOW_MEDIA_WITHIN_PARCEL_SETTING;
static const char* SHOW_MEDIA_OUTSIDE_PARCEL_SETTING;
--
GitLab