diff options
author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-08-29 12:48:44 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-08-29 12:48:44 -0400 |
commit | 842ac1e1503e41662c924289905b43b336b52a53 (patch) | |
tree | d8067fc99f6c699e3d15510c8521a32102f5cb30 /indra/llinventory/llsaleinfo.cpp | |
parent | 28678996ceaea019aafaa26911a440769320c498 (diff) | |
parent | 787b63f4c29f6ef56f355ec80084458a1bbcfb35 (diff) |
Merge pull request #4379 from secondlife/release/2025.06
Release/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) |