diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-09-09 14:23:24 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-09-09 14:23:24 +0800 |
| commit | 693137a6487e6ffda9ff15ade62d0e8bfec1bf49 (patch) | |
| tree | 12c078a35bebfd139d108f5fb7cd6c7fc4455c70 /indra/llinventory/llsaleinfo.cpp | |
| parent | b9ab04cd6e253848bad865fc1b5ea993a2a060f3 (diff) | |
| parent | 8a9a3dc9d760db37bb963d3e5bfadafdd94ee08d (diff) | |
Merge branch '2025.06'
Diffstat (limited to 'indra/llinventory/llsaleinfo.cpp')
| -rw-r--r-- | indra/llinventory/llsaleinfo.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp index 35bbc1dbb1..b4d64bb4fb 100644 --- a/indra/llinventory/llsaleinfo.cpp +++ b/indra/llinventory/llsaleinfo.cpp @@ -90,15 +90,20 @@ bool LLSaleInfo::exportLegacyStream(std::ostream& output_stream) const LLSD LLSaleInfo::asLLSD() const { LLSD sd; + asLLSD(sd); + return sd; +} + +void LLSaleInfo::asLLSD(LLSD& sd) const +{ const char* type = lookup(mSaleType); if (!type) { LL_WARNS_ONCE() << "Unknown sale type: " << mSaleType << LL_ENDL; type = lookup(LLSaleInfo::FS_NOT); } - sd["sale_type"] = type; + sd["sale_type"] = std::string(type); sd["sale_price"] = mSalePrice; - return sd; } bool LLSaleInfo::fromLLSD(const LLSD& sd, bool& has_perm_mask, U32& perm_mask) |