From 2add1e7abdf536b32bfbfa4b353189782df8cb19 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 12 Jun 2018 12:39:59 -0700
Subject: Time threshold on timer based updates.  Editor can replace frame with
 one from inventory. Extra check on adding a frame type.

---
 indra/newview/llsettingsvo.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llsettingsvo.cpp')

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
     {
-- 
cgit v1.2.3