1 files changed, 2 insertions, 36 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 0afb2162ab..71cec5125d 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -197,10 +197,7 @@ public:
 		U8 media_loop);
 
 	~LLViewerMediaImpl();
-
-    static void initClass(LLWindow* window, bool multi_threaded = false);
-    static void cleanupClass();
-
+	
 	// Override inherited version from LLViewerMediaEventEmitter 
 	virtual void emitEvent(LLPluginClassMedia* self, LLViewerMediaObserver::EMediaEvent event);
 
@@ -269,8 +266,6 @@ public:
 	void scaleTextureCoords(const LLVector2& texture_coords, S32 *x, S32 *y);
 
 	void update();
-    void doMediaTexUpdate();
-    void endMediaTexUpdate();
 	void updateImagesMediaStreams();
 	LLUUID getMediaTextureID() const;
 	
@@ -432,7 +427,6 @@ private:
 private:
 	// a single media url with some data and an impl.
 	boost::shared_ptr<LLPluginClassMedia> mMediaSource;
-    LLMutex mLock;
 	F64		mZoomFactor;
 	LLUUID mTextureId;
 	bool  mMovieImageHasMips;
@@ -495,35 +489,7 @@ private:
     bool mCanceling;
 
 private:
-	LLViewerMediaTexture *updateMediaImage();
-    LL::WorkQueue::weak_t mMainQueue;
-    LL::WorkQueue::weak_t mTexUpdateQueue;
-
-};
-
-// Define a worker thread pool for media updates (ref LLImageGLThread)
-class LLMediaTextureUpdateThread : public LLSimpleton<LLMediaTextureUpdateThread>, LL::ThreadPool
-{
-public:
-    // follows gSavedSettings "RenderGLMultiThreaded"
-    static bool sEnabled;
-
-    LLMediaTextureUpdateThread(LLWindow* window);
-
-    // post a function to be executed on the LLMediaTextureUpdateThread background thread
-    template <typename CALLABLE>
-    bool post(CALLABLE&& func)
-    {
-        return getQueue().postIfOpen(std::forward<CALLABLE>(func));
-    }
-
-    void run() override;
-
-private:
-    LLWindow* mWindow;
-    void* mContext = nullptr;
-    LLAtomicBool mFinished;
+	LLViewerMediaTexture *updatePlaceholderImage();
 };
 
-
 #endif	// LLVIEWERMEDIA_H