diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-07-16 17:54:58 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-07-16 17:54:58 +0000 |
| commit | 0274c1f2b16e571a0cc6295d1f3073b136210a7c (patch) | |
| tree | 4396f7f721befba4f907c0871067e3da1cdf0494 /indra/newview/llviewerassetstorage.h | |
| parent | 09d9b0556e8cf6c0a716e5b2c78b265799486331 (diff) | |
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
Diffstat (limited to 'indra/newview/llviewerassetstorage.h')
| -rw-r--r-- | indra/newview/llviewerassetstorage.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h index 15c11c7025..512b590a1b 100644 --- a/indra/newview/llviewerassetstorage.h +++ b/indra/newview/llviewerassetstorage.h @@ -47,6 +47,7 @@ public: LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, LLVFS *vfs); + using LLAssetStorage::storeAssetData; virtual void storeAssetData( const LLTransactionID& tid, LLAssetType::EType atype, |