diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
| commit | 63e7894148fdc7064b422bf65a0b75ffcf293496 (patch) | |
| tree | 4cca89d9da518f264001e7cb4950f453647f2e5f /indra/llinventory/llinventory.cpp | |
| parent | a75b85112ffa4b7140561083c2e5de05fb510805 (diff) | |
QAR-570 maint-render-4 merge
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
Diffstat (limited to 'indra/llinventory/llinventory.cpp')
| -rw-r--r-- | indra/llinventory/llinventory.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 686524b7da..0b28c70965 100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp @@ -217,7 +217,7 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream) // exportFile should be replaced with exportLegacyStream // not sure whether exportLegacyStream(llofstream(fp)) would work, fp may need to get icramented... -BOOL LLInventoryObject::exportFile(FILE* fp, BOOL) const +BOOL LLInventoryObject::exportFile(LLFILE* fp, BOOL) const { char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */ fprintf(fp, "\tinv_object\t0\n\t{\n"); @@ -520,7 +520,7 @@ BOOL LLInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32 } // virtual -BOOL LLInventoryItem::importFile(FILE* fp) +BOOL LLInventoryItem::importFile(LLFILE* fp) { // *NOTE: Changing the buffer size will require changing the scanf // calls below. @@ -674,7 +674,7 @@ BOOL LLInventoryItem::importFile(FILE* fp) return success; } -BOOL LLInventoryItem::exportFile(FILE* fp, BOOL include_asset_key) const +BOOL LLInventoryItem::exportFile(LLFILE* fp, BOOL include_asset_key) const { char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */ fprintf(fp, "\tinv_item\t0\n\t{\n"); @@ -1429,7 +1429,7 @@ void LLInventoryCategory::unpackMessage(LLMessageSystem* msg, } // virtual -BOOL LLInventoryCategory::importFile(FILE* fp) +BOOL LLInventoryCategory::importFile(LLFILE* fp) { // *NOTE: Changing the buffer size will require changing the scanf // calls below. @@ -1495,7 +1495,7 @@ BOOL LLInventoryCategory::importFile(FILE* fp) return TRUE; } -BOOL LLInventoryCategory::exportFile(FILE* fp, BOOL) const +BOOL LLInventoryCategory::exportFile(LLFILE* fp, BOOL) const { char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */ fprintf(fp, "\tinv_category\t0\n\t{\n"); |