From a6ff7db10171132ec2c8f6a3d3c133509bd760f1 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 --- 1 file changed, 3 deletions(-) (limited to 'indra/newview/lllocalbitmaps.cpp') 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(); -- cgit v1.2.3 From 65e6cc6704bcd19a471f06fb6ab7621f2044dfa4 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 31 Mar 2015 12:51:07 +0300 Subject: MAINT-5039 FIXED Viewer crashes at logout if wearing clothing textured with a local texture --- indra/newview/lllocalbitmaps.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lllocalbitmaps.cpp') diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp index 619140e922..2550c10c89 100755 --- a/indra/newview/lllocalbitmaps.cpp +++ b/indra/newview/lllocalbitmaps.cpp @@ -129,7 +129,7 @@ LLLocalBitmap::LLLocalBitmap(std::string filename) LLLocalBitmap::~LLLocalBitmap() { // replace IDs with defaults, if set to do so. - if(LL_LOCAL_REPLACE_ON_DEL && mValid) // fix for STORM-1837 + if(LL_LOCAL_REPLACE_ON_DEL && mValid && gAgentAvatarp) // fix for STORM-1837 { replaceIDs(mWorldID, IMG_DEFAULT); LLLocalBitmapMgr::doRebake(); -- cgit v1.2.3