DRTVWR-546, SL-16220, SL-16094: Undo previous glthread branch revert.

Reverting a merge is sticky: it tells git you never want to see that branch
again. Merging the DRTVWR-546 branch, which contained the revert, into the
glthread branch undid much of the development work on that branch. To restore
it we must revert the revert.

This reverts commit 029b41c0419e975bbb28454538b46dc69ce5d2ba.

1 files changed, 1 insertions, 35 deletions

diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index 8d0193abc8..b02815e990 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -36,44 +36,12 @@
 #include "llthread.h"
 #include "llthreadsafequeue.h"
 #include "llmutex.h"
+#include "workqueue.h"
 
 // Hack for async host by name
 #define LL_WM_HOST_RESOLVED      (WM_APP + 1)
 typedef void (*LLW32MsgCallback)(const MSG &msg);
 
-class LLWindowWin32;
-
-// Thread that owns the Window Handle
-class LLWindowWin32Thread : public LLThread
-{
-public:
-    class Message
-    {
-    public:
-        LRESULT mMsg;
-    };
-
-    static const int MAX_QUEUE_SIZE = 2048;
-
-    LLThreadSafeQueue<MSG> mMessageQueue;
-    LLThreadSafeQueue<std::function<void()>> mFunctionQueue;
-
-    bool mFinished = false;
-
-    LLWindowWin32Thread(LLWindowWin32* window);
-
-    void run() override;
-
-    void post(const std::function<void()>& func);
-
-private:
-
-    // call PeekMessage and pull enqueue messages for later processing
-    void gatherInput();
-    LLWindowWin32* mWindow = nullptr;
-
-};
-
 class LLWindowWin32 : public LLWindow
 {
 public:
@@ -218,7 +186,6 @@ protected:
 	HGLRC		mhRC = 0;			// OpenGL rendering context
 	HDC			mhDC = 0;			// Windows Device context handle
 	HINSTANCE	mhInstance;		// handle to application instance
-	WNDPROC		mWndProc;		// user-installable window proc
 	RECT		mOldMouseClip;  // Screen rect to which the mouse cursor was globally constrained before we changed it in clipMouse()
 	WPARAM		mLastSizeWParam;
 	F32			mOverrideAspectRatio;
@@ -280,7 +247,6 @@ protected:
 	void kickWindowThread(HWND windowHandle=0);
 
 	friend class LLWindowManager;
-    friend class LLWindowWin32Thread;
 };
 
 class LLSplashScreenWin32 : public LLSplashScreen