From 63e7894148fdc7064b422bf65a0b75ffcf293496 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 8 May 2008 18:41:20 +0000 Subject: 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. --- indra/newview/llpolymorph.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpolymorph.h') diff --git a/indra/newview/llpolymorph.h b/indra/newview/llpolymorph.h index 088963584e..8b4493ce86 100644 --- a/indra/newview/llpolymorph.h +++ b/indra/newview/llpolymorph.h @@ -51,7 +51,7 @@ public: LLPolyMorphData(char *morph_name); ~LLPolyMorphData(); - BOOL loadBinary(FILE* fp, LLPolyMeshSharedData *mesh); + BOOL loadBinary(LLFILE* fp, LLPolyMeshSharedData *mesh); char* loadASCII(char* text, LLPolyMeshSharedData *mesh); char* getName() { return mName; } -- cgit v1.2.3