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.

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 24c33bf292..30e5afdad1 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -100,13 +100,13 @@ public:
 	//virtual void packMessage(LLMessageSystem* msg) const;
 	virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0);
 	virtual BOOL unpackMessage(LLSD item);
-	virtual BOOL importFile(FILE* fp);
+	virtual BOOL importFile(LLFILE* fp);
 	virtual BOOL importLegacyStream(std::istream& input_stream);
 
 	// file handling on the viewer. These are not meant for anything
 	// other than cacheing.
-	bool exportFileLocal(FILE* fp) const;
-	bool importFileLocal(FILE* fp);
+	bool exportFileLocal(LLFILE* fp) const;
+	bool importFileLocal(LLFILE* fp);
 
 	// new methods
 	BOOL isComplete() const { return mIsComplete; }
@@ -182,8 +182,8 @@ public:
 
 	// file handling on the viewer. These are not meant for anything
 	// other than cacheing.
-	bool exportFileLocal(FILE* fp) const;
-	bool importFileLocal(FILE* fp);
+	bool exportFileLocal(LLFILE* fp) const;
+	bool importFileLocal(LLFILE* fp);
 
 protected:
 	LLUUID mOwnerID;