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/llmessage/llcachename.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/llmessage/llcachename.cpp')
| -rw-r--r-- | indra/llmessage/llcachename.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp index d482011194..1ad5179455 100644 --- a/indra/llmessage/llcachename.cpp +++ b/indra/llmessage/llcachename.cpp @@ -323,7 +323,7 @@ void LLCacheName::cancelCallback(const LLUUID& id, LLCacheNameCallback callback, } } -void LLCacheName::importFile(FILE* fp) +void LLCacheName::importFile(LLFILE* fp) { S32 count = 0; |