diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-12 12:39:59 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-12 12:39:59 -0700 |
| commit | 2add1e7abdf536b32bfbfa4b353189782df8cb19 (patch) | |
| tree | 35866e89acb21c13a6c14e078e6f45fc8d384126 /indra/newview/llsettingsvo.cpp | |
| parent | 0f608cb764856ae8586a9d9631842a782cb70a23 (diff) | |
Time threshold on timer based updates. Editor can replace frame with one from inventory. Extra check on adding a frame type.
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
| -rw-r--r-- | indra/newview/llsettingsvo.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 0ec7db2ed7..fba62e1ce9 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -222,7 +222,10 @@ void LLSettingsVOBase::onAssetDownloadComplete(LLVFS *vfs, const LLUUID &asset_i status = 1; LL_WARNS("SETTINGS") << "Unable to creat settings object." << LL_ENDL; } - + else + { + settings->setAssetId(asset_id); + } } else { |