diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-16 01:08:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-16 01:08:13 +0300 |
| commit | d41e167aa9a22b446cbcfe6fd4ebdd810c61ba73 (patch) | |
| tree | 3ed50d019b3d78c748ed6b46ca69f2ca7943f41a /indra/newview/llsettingsvo.h | |
| parent | 29be88d60d654193926add496d2d851f7c217356 (diff) | |
| parent | bdb8caf790207e1a6f46d495a586b38bb52e58e9 (diff) | |
Merge pull request #1478 from secondlife/marchcat/x-mf-merge
Maint X -> Materials Featurette merge
Diffstat (limited to 'indra/newview/llsettingsvo.h')
| -rw-r--r-- | indra/newview/llsettingsvo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h index 4f410ab7d9..c55b3f82b9 100644 --- a/indra/newview/llsettingsvo.h +++ b/indra/newview/llsettingsvo.h @@ -80,7 +80,7 @@ private: static void onAgentAssetUploadComplete(LLUUID itemId, LLUUID newAssetId, LLUUID newItemId, LLSD response, LLSettingsBase::ptr_t psettings, inventory_result_fn callback); static void onTaskAssetUploadComplete(LLUUID itemId, LLUUID taskId, LLUUID newAssetId, LLSD response, LLSettingsBase::ptr_t psettings, inventory_result_fn callback); - + static void onAssetDownloadComplete(const LLUUID &asset_id, S32 status, LLExtStat ext_status, asset_download_fn callback); }; @@ -171,7 +171,7 @@ public: virtual ptr_t buildDeepCloneAndUncompress() const SETTINGS_OVERRIDE; static LLSD convertToLegacy(const ptr_t &); - + virtual LLSettingsSkyPtr_t getDefaultSky() const override; virtual LLSettingsWaterPtr_t getDefaultWater() const override; virtual LLSettingsSkyPtr_t buildSky(LLSD) const override; |