diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
| commit | 63e7894148fdc7064b422bf65a0b75ffcf293496 (patch) | |
| tree | 4cca89d9da518f264001e7cb4950f453647f2e5f /indra/llinventory/llpermissions.cpp | |
| parent | a75b85112ffa4b7140561083c2e5de05fb510805 (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/llinventory/llpermissions.cpp')
| -rw-r--r-- | indra/llinventory/llpermissions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp index f816d54181..1788fedf50 100644 --- a/indra/llinventory/llpermissions.cpp +++ b/indra/llinventory/llpermissions.cpp @@ -544,7 +544,7 @@ void LLPermissions::unpackMessage(LLMessageSystem* msg, const char* block, S32 b // File support // -BOOL LLPermissions::importFile(FILE* fp) +BOOL LLPermissions::importFile(LLFILE* fp) { init(LLUUID::null, LLUUID::null, LLUUID::null, LLUUID::null); const S32 BUFSIZE = 16384; @@ -648,7 +648,7 @@ BOOL LLPermissions::importFile(FILE* fp) } -BOOL LLPermissions::exportFile(FILE* fp) const +BOOL LLPermissions::exportFile(LLFILE* fp) const { char uuid_str[256]; /* Flawfinder: ignore */ |