summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplay.h
diff options
context:
space:
mode:
authorruslantproductengine <ruslantproductengine@lindenlab.com>2014-11-03 20:05:20 +0200
committerruslantproductengine <ruslantproductengine@lindenlab.com>2014-11-03 20:05:20 +0200
commit799d13269a5cdf29a5d68c15ceac42f0407b5833 (patch)
treeae1f17a27c9d1d02f302d2b5c73ed0aea25e8371 /indra/newview/llviewerdisplay.h
parentf3d73d9e724e9ae1062bf109b6764d43ccba3114 (diff)
MAINT-3585 FIXED Viewer Crashes when attempting to upload image.
The bug was fixed, the reasone of crash is following. The Core Flow view contain another GL context and will not care about restoring a previous. I restore context manually. This path also contain a minor changes in another files. All changes described here. Сhange's for fix current bug. indra/llwindow/llwindow.h indra/llwindow/llwindowheadless.h indra/llwindow/llwindowmacosx.h indra/llwindow/llwindowsdl.h indra/llwindow/llwindowwin32.h indra/newview/lllocalbitmaps.cpp indra/newview/llviewerdisplay.cpp indra/newview/llviewerdisplay.h Twice mUsage initialization (replace to forward initialization). indra/llcharacter/lljointstate.h Looks like condition should be befor memcopy call, otherwise - possible CRASH. indra/llcommon/llmd5.cpp Unused condition and variables. indra/llmath/llsphere.cpp Looks like should be under if otherwise - possible CRASH indra\llprimitive\llmodel.cpp Useless assert's. indra/llrender/llrender.cpp indra/newview/lldaycyclemanager.cpp
Diffstat (limited to 'indra/newview/llviewerdisplay.h')
-rwxr-xr-xindra/newview/llviewerdisplay.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerdisplay.h b/indra/newview/llviewerdisplay.h
index f6467d7f93..dcc78fe42f 100755
--- a/indra/newview/llviewerdisplay.h
+++ b/indra/newview/llviewerdisplay.h
@@ -34,6 +34,8 @@ 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;