summaryrefslogtreecommitdiff
path: root/indra/llinventory/llsettingsbase.h
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-08-06 18:39:52 +0100
committerGraham Linden <graham@lindenlab.com>2018-08-06 18:39:52 +0100
commit46c6ead5c3fe87405a644e3167f15b9c6239ee03 (patch)
tree4117fbb6dc9aa7bc198e4796fe2c194b4938df3f /indra/llinventory/llsettingsbase.h
parent7da3a1eb4f14b67c698977eb1947ce06a312d507 (diff)
parent057d115ac3de49db0e35066975441e64111c8369 (diff)
Merge
Diffstat (limited to 'indra/llinventory/llsettingsbase.h')
-rw-r--r--indra/llinventory/llsettingsbase.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingsbase.h b/indra/llinventory/llsettingsbase.h
index a74579e7a6..beaeac2d04 100644
--- a/indra/llinventory/llsettingsbase.h
+++ b/indra/llinventory/llsettingsbase.h
@@ -244,10 +244,15 @@ public:
inline void setAssetId(LLUUID value)
{ // note that this skips setLLSD
- LL_WARNS("LAPRAS") << "Settings asset id set to:{" << value << "}" << LL_ENDL;
mSettings[SETTING_ASSETID] = value;
}
+ inline void clearAssetId()
+ {
+ if (mSettings.has(SETTING_ASSETID))
+ mSettings.erase(SETTING_ASSETID);
+ }
+
protected:
LLSettingsBase();