diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-06-12 19:12:09 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-06-12 19:12:09 +0300 |
| commit | 04e67fa12d1dac368e2f88a04af4cd266b8b2063 (patch) | |
| tree | 138e49a72de3ee4810f5f4676fc0dc3ccffe095b /indra/newview/llstartup.cpp | |
| parent | 19221d9ccf38a5b10e7e2ecefb1ad121f1fb51d7 (diff) | |
SL-11402 Last session image should be saved as png
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index e34a9beb49..256ece594c 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -113,7 +113,7 @@ #include "llgroupmgr.h" #include "llhudeffecttrail.h" #include "llhudmanager.h" -#include "llimagebmp.h" +#include "llimagepng.h" #include "llinventorybridge.h" #include "llinventorymodel.h" #include "llinventorymodelbackgroundfetch.h" @@ -210,8 +210,8 @@ bool gAgentMovementCompleted = false; S32 gMaxAgentGroups; -const std::string SCREEN_HOME_FILENAME = "screen_home%s.bmp"; -const std::string SCREEN_LAST_FILENAME = "screen_last%s.bmp"; +const std::string SCREEN_HOME_FILENAME = "screen_home%s.png"; +const std::string SCREEN_LAST_FILENAME = "screen_last%s.png"; LLPointer<LLViewerTexture> gStartTexture; @@ -2709,7 +2709,7 @@ void init_start_screen(S32 location_id) temp_str += LLStartUp::getScreenHomeFilename(); } - LLPointer<LLImageBMP> start_image_bmp = new LLImageBMP; + LLPointer<LLImagePNG> start_image_png = new LLImagePNG; // Turn off start screen to get around the occasional readback // driver bug @@ -2718,18 +2718,18 @@ void init_start_screen(S32 location_id) LL_INFOS("AppInit") << "Bitmap load disabled" << LL_ENDL; return; } - else if(!start_image_bmp->load(temp_str) ) + else if(!start_image_png->load(temp_str) ) { LL_WARNS("AppInit") << "Bitmap load failed" << LL_ENDL; gStartTexture = NULL; } else { - gStartImageWidth = start_image_bmp->getWidth(); - gStartImageHeight = start_image_bmp->getHeight(); + gStartImageWidth = start_image_png->getWidth(); + gStartImageHeight = start_image_png->getHeight(); LLPointer<LLImageRaw> raw = new LLImageRaw; - if (!start_image_bmp->decode(raw, 0.0f)) + if (!start_image_png->decode(raw, 0.0f)) { LL_WARNS("AppInit") << "Bitmap decode failed" << LL_ENDL; gStartTexture = NULL; |