diff options
| author | Aleric Inglewood | 2010-11-07 16:55:50 +0100 |
|---|---|---|
| committer | Aleric Inglewood | 2010-11-07 18:27:48 +0100 |
| commit | 5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch) | |
| tree | 43fae9945562c3281746370d623877840ed884b2 /linden/indra/llmessage/llhttpassetstorage.h | |
| parent | IMP-688: ERROR: getString: Invalid string control nick01 (diff) | |
| download | meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.zip meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.gz meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.bz2 meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.xz | |
IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins
See http://jira.secondlife.com/browse/SNOW-713
This patch makes llcommon shared. It contains the following snowglobe
(SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500,
3519 and 3531, plus the fix for all rejects. Note that changes
to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500
and 3625) were ignored as we don't have scripts/automated_build_scripts.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llmessage/llhttpassetstorage.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/llmessage/llhttpassetstorage.h b/linden/indra/llmessage/llhttpassetstorage.h index 5786c5d..231437d 100644 --- a/linden/indra/llmessage/llhttpassetstorage.h +++ b/linden/indra/llmessage/llhttpassetstorage.h | |||
| @@ -62,6 +62,8 @@ public: | |||
| 62 | 62 | ||
| 63 | virtual ~LLHTTPAssetStorage(); | 63 | virtual ~LLHTTPAssetStorage(); |
| 64 | 64 | ||
| 65 | using LLAssetStorage::storeAssetData; // Unhiding virtuals... | ||
| 66 | |||
| 65 | virtual void storeAssetData( | 67 | virtual void storeAssetData( |
| 66 | const LLUUID& uuid, | 68 | const LLUUID& uuid, |
| 67 | LLAssetType::EType atype, | 69 | LLAssetType::EType atype, |