diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-16 10:32:03 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-16 10:32:03 -0400 |
| commit | e19cf9aedd0ed775022ce9704127e7958796494a (patch) | |
| tree | 2a4a590cb1206bee59ab7eb9ccec067ca2fbdd39 /indra/newview/llsettingsvo.h | |
| parent | 0eaca22969fb14402a898325a64276e1c11dff0c (diff) | |
| parent | b31789c146aab2e1fe0040f9c3c4cf42526e9c4b (diff) | |
Merge branch 'release/maint-b' into nat/maint-b-tests
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; |