From 90573badb4fcea3ae771c466e859854547ed7ad5 Mon Sep 17 00:00:00 2001 From: ruslantproductengine Date: Mon, 30 Mar 2015 20:11:27 +0300 Subject: MAINT-3585 FIXED (Crashes when attempting to upload image.) --- indra/newview/lllocalbitmaps.cpp | 3 --- indra/newview/llviewerdisplay.cpp | 8 -------- indra/newview/llviewerdisplay.h | 2 -- 3 files changed, 13 deletions(-) (limited to 'indra/newview') 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