summaryrefslogtreecommitdiff
path: root/indra/newview/llwearable.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/newview/llwearable.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/newview/llwearable.h')
-rw-r--r--indra/newview/llwearable.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h
index 1b0fb3d7aa..fb66663fc2 100644
--- a/indra/newview/llwearable.h
+++ b/indra/newview/llwearable.h
@@ -78,8 +78,8 @@ public:
void removeFromAvatar( BOOL set_by_user ) { LLWearable::removeFromAvatar( mType, set_by_user ); }
static void removeFromAvatar( EWearableType type, BOOL set_by_user );
- BOOL exportFile(FILE* file);
- BOOL importFile(FILE* file);
+ BOOL exportFile(LLFILE* file);
+ BOOL importFile(LLFILE* file);
EWearableType getType() const { return mType; }
void setType( EWearableType type ) { mType = type; }