aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-03-05 15:29:10 -0700
committerJacek Antonelli2010-03-11 19:15:18 -0600
commitf7a723e67924333a448d9afc18541bdf3d914afb (patch)
tree0a8e1753817ea3404b7527fc5cdb37a89b945bd7 /linden
parentCommented out -DPACKAGE:BOOL=ON for Windows in develop.py. (diff)
downloadmeta-impy-f7a723e67924333a448d9afc18541bdf3d914afb.zip
meta-impy-f7a723e67924333a448d9afc18541bdf3d914afb.tar.gz
meta-impy-f7a723e67924333a448d9afc18541bdf3d914afb.tar.bz2
meta-impy-f7a723e67924333a448d9afc18541bdf3d914afb.tar.xz
Applied SaveTextureAsFileExtension patch from Cool Viewer.
Fixes textures being saved without the proper .tga filename extension. Patch by Henri Beauchamp. (slviewer-0-v12350-SaveTextureAsFileExtension.patch)
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/newview/llpreviewtexture.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/newview/llpreviewtexture.cpp b/linden/indra/newview/llpreviewtexture.cpp
index dcbb669..6627579 100644
--- a/linden/indra/newview/llpreviewtexture.cpp
+++ b/linden/indra/newview/llpreviewtexture.cpp
@@ -316,6 +316,12 @@ void LLPreviewTexture::saveAs()
316 } 316 }
317 // remember the user-approved/edited file name. 317 // remember the user-approved/edited file name.
318 mSaveFileName = file_picker.getFirstFile(); 318 mSaveFileName = file_picker.getFirstFile();
319 std::string filename = mSaveFileName;
320 LLStringUtil::toLower(filename);
321 if (filename.find(".tga") != filename.length() - 4)
322 {
323 mSaveFileName += ".tga";
324 }
319 mLoadingFullImage = TRUE; 325 mLoadingFullImage = TRUE;
320 getWindow()->incBusyCount(); 326 getWindow()->incBusyCount();
321 mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave, 327 mImage->setLoadedCallback( LLPreviewTexture::onFileLoadedForSave,