aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerinventory.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:50 -0500
committerJacek Antonelli2008-08-15 23:45:50 -0500
commit2a4dea528f670b9bb1f77ef27a8a1dd16603d114 (patch)
tree95c68e362703c9099d571ecbdc6142b1cda1e005 /linden/indra/newview/llviewerinventory.cpp
parentSecond Life viewer sources 1.20.6 (diff)
downloadmeta-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/llviewerinventory.cpp')
-rw-r--r--linden/indra/newview/llviewerinventory.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llviewerinventory.cpp b/linden/indra/newview/llviewerinventory.cpp
index db005c7..d7c1778 100644
--- a/linden/indra/newview/llviewerinventory.cpp
+++ b/linden/indra/newview/llviewerinventory.cpp
@@ -254,7 +254,7 @@ void LLViewerInventoryItem::packMessage(LLMessageSystem* msg) const
254 msg->addU32Fast(_PREHASH_CRC, crc); 254 msg->addU32Fast(_PREHASH_CRC, crc);
255} 255}
256// virtual 256// virtual
257BOOL LLViewerInventoryItem::importFile(FILE* fp) 257BOOL LLViewerInventoryItem::importFile(LLFILE* fp)
258{ 258{
259 BOOL rv = LLInventoryItem::importFile(fp); 259 BOOL rv = LLInventoryItem::importFile(fp);
260 mIsComplete = TRUE; 260 mIsComplete = TRUE;
@@ -269,7 +269,7 @@ BOOL LLViewerInventoryItem::importLegacyStream(std::istream& input_stream)
269 return rv; 269 return rv;
270} 270}
271 271
272bool LLViewerInventoryItem::importFileLocal(FILE* fp) 272bool LLViewerInventoryItem::importFileLocal(LLFILE* fp)
273{ 273{
274 // TODO: convert all functions that return BOOL to return bool 274 // TODO: convert all functions that return BOOL to return bool
275 bool rv = (LLInventoryItem::importFile(fp) ? true : false); 275 bool rv = (LLInventoryItem::importFile(fp) ? true : false);
@@ -277,7 +277,7 @@ bool LLViewerInventoryItem::importFileLocal(FILE* fp)
277 return rv; 277 return rv;
278} 278}
279 279
280bool LLViewerInventoryItem::exportFileLocal(FILE* fp) const 280bool LLViewerInventoryItem::exportFileLocal(LLFILE* fp) const
281{ 281{
282 char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */ 282 char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */
283 fprintf(fp, "\tinv_item\t0\n\t{\n"); 283 fprintf(fp, "\tinv_item\t0\n\t{\n");
@@ -469,7 +469,7 @@ bool LLViewerInventoryCategory::fetchDescendents()
469 return false; 469 return false;
470} 470}
471 471
472bool LLViewerInventoryCategory::importFileLocal(FILE* fp) 472bool LLViewerInventoryCategory::importFileLocal(LLFILE* fp)
473{ 473{
474 // *NOTE: This buffer size is hard coded into scanf() below. 474 // *NOTE: This buffer size is hard coded into scanf() below.
475 char buffer[MAX_STRING]; /* Flawfinder: ignore */ 475 char buffer[MAX_STRING]; /* Flawfinder: ignore */
@@ -538,7 +538,7 @@ bool LLViewerInventoryCategory::importFileLocal(FILE* fp)
538 return true; 538 return true;
539} 539}
540 540
541bool LLViewerInventoryCategory::exportFileLocal(FILE* fp) const 541bool LLViewerInventoryCategory::exportFileLocal(LLFILE* fp) const
542{ 542{
543 char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */ 543 char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */
544 fprintf(fp, "\tinv_category\t0\n\t{\n"); 544 fprintf(fp, "\tinv_category\t0\n\t{\n");