diff options
Diffstat (limited to 'linden/indra/llinventory/llinventory.h')
| -rw-r--r-- | linden/indra/llinventory/llinventory.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h index b4199db..1bb6b85 100644 --- a/linden/indra/llinventory/llinventory.h +++ b/linden/indra/llinventory/llinventory.h | |||
| @@ -101,8 +101,8 @@ public: | |||
| 101 | 101 | ||
| 102 | // file support - implemented here so that a minimal information | 102 | // file support - implemented here so that a minimal information |
| 103 | // set can be transmitted between simulator and viewer. | 103 | // set can be transmitted between simulator and viewer. |
| 104 | // virtual BOOL importFile(FILE* fp); | 104 | // virtual BOOL importFile(LLFILE* fp); |
| 105 | virtual BOOL exportFile(FILE* fp, BOOL include_asset_key = TRUE) const; | 105 | virtual BOOL exportFile(LLFILE* fp, BOOL include_asset_key = TRUE) const; |
| 106 | 106 | ||
| 107 | virtual BOOL importLegacyStream(std::istream& input_stream); | 107 | virtual BOOL importLegacyStream(std::istream& input_stream); |
| 108 | virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; | 108 | virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; |
| @@ -259,8 +259,8 @@ public: | |||
| 259 | // we want to detect network mangling somehow. | 259 | // we want to detect network mangling somehow. |
| 260 | virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0); | 260 | virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0); |
| 261 | // file support | 261 | // file support |
| 262 | virtual BOOL importFile(FILE* fp); | 262 | virtual BOOL importFile(LLFILE* fp); |
| 263 | virtual BOOL exportFile(FILE* fp, BOOL include_asset_key = TRUE) const; | 263 | virtual BOOL exportFile(LLFILE* fp, BOOL include_asset_key = TRUE) const; |
| 264 | 264 | ||
| 265 | virtual BOOL importLegacyStream(std::istream& input_stream); | 265 | virtual BOOL importLegacyStream(std::istream& input_stream); |
| 266 | virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; | 266 | virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; |
| @@ -319,8 +319,8 @@ public: | |||
| 319 | bool fromLLSD(LLSD& sd); | 319 | bool fromLLSD(LLSD& sd); |
| 320 | 320 | ||
| 321 | // file support | 321 | // file support |
| 322 | virtual BOOL importFile(FILE* fp); | 322 | virtual BOOL importFile(LLFILE* fp); |
| 323 | virtual BOOL exportFile(FILE* fp, BOOL include_asset_key = TRUE) const; | 323 | virtual BOOL exportFile(LLFILE* fp, BOOL include_asset_key = TRUE) const; |
| 324 | 324 | ||
| 325 | virtual BOOL importLegacyStream(std::istream& input_stream); | 325 | virtual BOOL importLegacyStream(std::istream& input_stream); |
| 326 | virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; | 326 | virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const; |