summaryrefslogtreecommitdiff
path: root/indra/llmessage/lldatapacker.h
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-05-08 18:41:20 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-05-08 18:41:20 +0000
commit63e7894148fdc7064b422bf65a0b75ffcf293496 (patch)
tree4cca89d9da518f264001e7cb4950f453647f2e5f /indra/llmessage/lldatapacker.h
parenta75b85112ffa4b7140561083c2e5de05fb510805 (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/llmessage/lldatapacker.h')
-rw-r--r--indra/llmessage/lldatapacker.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/lldatapacker.h b/indra/llmessage/lldatapacker.h
index ff33d4ecc2..d6d1f5c1da 100644
--- a/indra/llmessage/lldatapacker.h
+++ b/indra/llmessage/lldatapacker.h
@@ -330,7 +330,7 @@ inline BOOL LLDataPackerAsciiBuffer::verifyLength(const S32 data_size, const cha
class LLDataPackerAsciiFile : public LLDataPacker
{
public:
- LLDataPackerAsciiFile(FILE *fp, const S32 indent = 2)
+ LLDataPackerAsciiFile(LLFILE *fp, const S32 indent = 2)
: LLDataPacker(),
mIndent(indent),
mFP(fp),
@@ -407,7 +407,7 @@ protected:
protected:
S32 mIndent;
- FILE *mFP;
+ LLFILE *mFP;
std::ostream* mOutputStream;
std::istream* mInputStream;
};