diff options
author | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:50 -0500 |
commit | 2a4dea528f670b9bb1f77ef27a8a1dd16603d114 (patch) | |
tree | 95c68e362703c9099d571ecbdc6142b1cda1e005 /linden/indra/newview/llinventorymodel.cpp | |
parent | Second Life viewer sources 1.20.6 (diff) | |
download | meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.zip meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.gz meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.bz2 meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.xz |
Second Life viewer sources 1.20.7
Diffstat (limited to 'linden/indra/newview/llinventorymodel.cpp')
-rw-r--r-- | linden/indra/newview/llinventorymodel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp index e76c427..91bdb8d 100644 --- a/linden/indra/newview/llinventorymodel.cpp +++ b/linden/indra/newview/llinventorymodel.cpp | |||
@@ -1810,7 +1810,7 @@ bool LLInventoryModel::loadSkeleton( | |||
1810 | const S32 NO_VERSION = LLViewerInventoryCategory::VERSION_UNKNOWN; | 1810 | const S32 NO_VERSION = LLViewerInventoryCategory::VERSION_UNKNOWN; |
1811 | std::string gzip_filename(inventory_filename); | 1811 | std::string gzip_filename(inventory_filename); |
1812 | gzip_filename.append(".gz"); | 1812 | gzip_filename.append(".gz"); |
1813 | FILE* fp = LLFile::fopen(gzip_filename.c_str(), "rb"); /*Flawfinder: ignore*/ | 1813 | LLFILE* fp = LLFile::fopen(gzip_filename.c_str(), "rb"); /*Flawfinder: ignore*/ |
1814 | bool remove_inventory_file = false; | 1814 | bool remove_inventory_file = false; |
1815 | if(fp) | 1815 | if(fp) |
1816 | { | 1816 | { |
@@ -2344,7 +2344,7 @@ bool LLInventoryModel::loadFromFile( | |||
2344 | return false; | 2344 | return false; |
2345 | } | 2345 | } |
2346 | llinfos << "LLInventoryModel::loadFromFile(" << filename << ")" << llendl; | 2346 | llinfos << "LLInventoryModel::loadFromFile(" << filename << ")" << llendl; |
2347 | FILE* file = LLFile::fopen(filename, "rb"); /*Flawfinder: ignore*/ | 2347 | LLFILE* file = LLFile::fopen(filename, "rb"); /*Flawfinder: ignore*/ |
2348 | if(!file) | 2348 | if(!file) |
2349 | { | 2349 | { |
2350 | llinfos << "unable to load inventory from: " << filename << llendl; | 2350 | llinfos << "unable to load inventory from: " << filename << llendl; |
@@ -2417,7 +2417,7 @@ bool LLInventoryModel::saveToFile( | |||
2417 | return false; | 2417 | return false; |
2418 | } | 2418 | } |
2419 | llinfos << "LLInventoryModel::saveToFile(" << filename << ")" << llendl; | 2419 | llinfos << "LLInventoryModel::saveToFile(" << filename << ")" << llendl; |
2420 | FILE* file = LLFile::fopen(filename, "wb"); /*Flawfinder: ignore*/ | 2420 | LLFILE* file = LLFile::fopen(filename, "wb"); /*Flawfinder: ignore*/ |
2421 | if(!file) | 2421 | if(!file) |
2422 | { | 2422 | { |
2423 | llwarns << "unable to save inventory to: " << filename << llendl; | 2423 | llwarns << "unable to save inventory to: " << filename << llendl; |
@@ -3692,7 +3692,7 @@ BOOL decompress_file(const char* src_filename, const char* dst_filename) | |||
3692 | BOOL rv = FALSE; | 3692 | BOOL rv = FALSE; |
3693 | gzFile src = NULL; | 3693 | gzFile src = NULL; |
3694 | U8* buffer = NULL; | 3694 | U8* buffer = NULL; |
3695 | FILE* dst = NULL; | 3695 | LLFILE* dst = NULL; |
3696 | S32 bytes = 0; | 3696 | S32 bytes = 0; |
3697 | const S32 DECOMPRESS_BUFFER_SIZE = 32000; | 3697 | const S32 DECOMPRESS_BUFFER_SIZE = 32000; |
3698 | 3698 | ||