aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerinventory.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewerinventory.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llviewerinventory.h b/linden/indra/newview/llviewerinventory.h
index 05dc19a..e80a042 100644
--- a/linden/indra/newview/llviewerinventory.h
+++ b/linden/indra/newview/llviewerinventory.h
@@ -100,13 +100,13 @@ public:
100 //virtual void packMessage(LLMessageSystem* msg) const; 100 //virtual void packMessage(LLMessageSystem* msg) const;
101 virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0); 101 virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
102 virtual BOOL unpackMessage(LLSD item); 102 virtual BOOL unpackMessage(LLSD item);
103 virtual BOOL importFile(FILE* fp); 103 virtual BOOL importFile(LLFILE* fp);
104 virtual BOOL importLegacyStream(std::istream& input_stream); 104 virtual BOOL importLegacyStream(std::istream& input_stream);
105 105
106 // file handling on the viewer. These are not meant for anything 106 // file handling on the viewer. These are not meant for anything
107 // other than cacheing. 107 // other than cacheing.
108 bool exportFileLocal(FILE* fp) const; 108 bool exportFileLocal(LLFILE* fp) const;
109 bool importFileLocal(FILE* fp); 109 bool importFileLocal(LLFILE* fp);
110 110
111 // new methods 111 // new methods
112 BOOL isComplete() const { return mIsComplete; } 112 BOOL isComplete() const { return mIsComplete; }
@@ -182,8 +182,8 @@ public:
182 182
183 // file handling on the viewer. These are not meant for anything 183 // file handling on the viewer. These are not meant for anything
184 // other than cacheing. 184 // other than cacheing.
185 bool exportFileLocal(FILE* fp) const; 185 bool exportFileLocal(LLFILE* fp) const;
186 bool importFileLocal(FILE* fp); 186 bool importFileLocal(LLFILE* fp);
187 187
188protected: 188protected:
189 LLUUID mOwnerID; 189 LLUUID mOwnerID;