From 90573badb4fcea3ae771c466e859854547ed7ad5 Mon Sep 17 00:00:00 2001
From: ruslantproductengine <ruslantproductengine@lindenlab.com>
Date: Mon, 30 Mar 2015 20:11:27 +0300
Subject: MAINT-3585 FIXED (Crashes when attempting to upload image.)

---
 indra/llwindow/llwindow.h           | 1 -
 indra/llwindow/llwindowheadless.cpp | 4 ----
 indra/llwindow/llwindowheadless.h   | 1 -
 indra/llwindow/llwindowmacosx.cpp   | 2 ++
 indra/llwindow/llwindowmacosx.h     | 8 ++++----
 indra/newview/lllocalbitmaps.cpp    | 3 ---
 indra/newview/llviewerdisplay.cpp   | 8 --------
 indra/newview/llviewerdisplay.h     | 2 --
 8 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index 0aa1fbe905..0a30f4c807 100755
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -122,7 +122,6 @@ public:
 	virtual void gatherInput() = 0;
 	virtual void delayInputProcessing() = 0;
 	virtual void swapBuffers() = 0;
-	virtual void restoreGLContext() = 0;
 	virtual void bringToFront() = 0;
 	virtual void focusClient() { };		// this may not have meaning or be required on other platforms, therefore, it's not abstract
 	virtual void setOldResize(bool oldresize) { };
diff --git a/indra/llwindow/llwindowheadless.cpp b/indra/llwindow/llwindowheadless.cpp
index b6f67c6107..70f473281b 100755
--- a/indra/llwindow/llwindowheadless.cpp
+++ b/indra/llwindow/llwindowheadless.cpp
@@ -51,7 +51,3 @@ LLWindowHeadless::~LLWindowHeadless()
 void LLWindowHeadless::swapBuffers()
 {
 }
-
-void LLWindowHeadless::restoreGLContext()
-{
-}
diff --git a/indra/llwindow/llwindowheadless.h b/indra/llwindow/llwindowheadless.h
index 5975ee3410..c692666df1 100755
--- a/indra/llwindow/llwindowheadless.h
+++ b/indra/llwindow/llwindowheadless.h
@@ -74,7 +74,6 @@ public:
 	/*virtual*/ void gatherInput() {};
 	/*virtual*/ void delayInputProcessing() {};
 	/*virtual*/ void swapBuffers();
-	/*virtual*/ void restoreGLContext();
 
 	
     // handy coordinate space conversion routines
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 1f577b117e..fc1ea06d10 100755
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -1163,6 +1163,8 @@ void LLWindowMacOSX::beforeDialog()
 
 void LLWindowMacOSX::afterDialog()
 {
+    //For fix problem with Core Flow view on OSX
+    restoreGLContext();
 }
 
 
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h
index 194c9bb27a..9e9bd8ae39 100755
--- a/indra/llwindow/llwindowmacosx.h
+++ b/indra/llwindow/llwindowmacosx.h
@@ -87,9 +87,7 @@ public:
 	/*virtual*/ void gatherInput();
 	/*virtual*/ void delayInputProcessing() {};
 	/*virtual*/ void swapBuffers();
-	/*virtual*/ void restoreGLContext();
-
-
+	
 	// handy coordinate space conversion routines
 	/*virtual*/ BOOL convertCoords(LLCoordScreen from, LLCoordWindow *to);
 	/*virtual*/ BOOL convertCoords(LLCoordWindow from, LLCoordScreen *to);
@@ -157,7 +155,9 @@ protected:
     
     //Satisfy MAINT-3135 and MAINT-3288 with a flag.
     /*virtual */ void setOldResize(bool oldresize) {setResizeMode(oldresize, mGLView); }
- 
+
+private:
+    void restoreGLContext();
 
 protected:
 	//
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index 4a89fc92b4..619140e922 100755
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -844,9 +844,6 @@ bool LLLocalBitmapMgr::addUnit()
 	LLFilePicker& picker = LLFilePicker::instance();
 	if (picker.getMultipleOpenFiles(LLFilePicker::FFLOAD_IMAGE))
 	{
-		//For fix problem with Core Flow view on OSX
-        restoreGLContext();
-        
 		sTimer.stopTimer();
 
 		std::string filename = picker.getFirstFile();
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 9ef911616e..ea9463da04 100755
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -1344,14 +1344,6 @@ void swap()
 	gDisplaySwapBuffers = TRUE;
 }
 
-void restoreGLContext()
-{
-	if(gViewerWindow && gViewerWindow->getWindow()) 
-	{
-		gViewerWindow->getWindow()->restoreGLContext();
-	}
-}
-
 void renderCoordinateAxes()
 {
 	gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
diff --git a/indra/newview/llviewerdisplay.h b/indra/newview/llviewerdisplay.h
index dcc78fe42f..f6467d7f93 100755
--- a/indra/newview/llviewerdisplay.h
+++ b/indra/newview/llviewerdisplay.h
@@ -34,8 +34,6 @@ void display_cleanup();
 
 void display(BOOL rebuild = TRUE, F32 zoom_factor = 1.f, int subfield = 0, BOOL for_snapshot = FALSE);
 
-void restoreGLContext();
-
 extern BOOL gDisplaySwapBuffers;
 extern BOOL gDepthDirty;
 extern BOOL	gTeleportDisplay;
-- 
cgit v1.2.3