summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetstorage.h
diff options
context:
space:
mode:
authorChristian Goetze <cg@lindenlab.com>2007-08-21 22:17:53 +0000
committerChristian Goetze <cg@lindenlab.com>2007-08-21 22:17:53 +0000
commitce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch)
tree3388e6f8ff02292ec4521d278c841801462945b8 /indra/newview/llviewerassetstorage.h
parentb699ae454d8477d19342d320758cd993d1d28cec (diff)
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/newview/llviewerassetstorage.h')
-rw-r--r--indra/newview/llviewerassetstorage.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h
index 7817e6450f..64c0a96795 100644
--- a/indra/newview/llviewerassetstorage.h
+++ b/indra/newview/llviewerassetstorage.h
@@ -17,8 +17,6 @@ class LLVFile;
class LLViewerAssetStorage : public LLAssetStorage
{
public:
- typedef void (*LLStoreAssetCallback)(const LLUUID &transaction_id, void *user_data, S32 status);
-
LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
LLVFS *vfs, const LLHost &upstream_host);