diff options
| author | Rider Linden <rider@lindenlab.com> | 2025-03-25 09:58:43 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2025-03-25 09:58:43 -0700 |
| commit | b86c36eafcdb0fb42c1b68ef671050dea67dc6c3 (patch) | |
| tree | dfa54e83a9ccac2c5346210c05626e61760e2822 /indra/llinventory/llsaleinfo.cpp | |
| parent | 48ccb0f75b078670ced1f8fe8d4942abe0a6f293 (diff) | |
| parent | 423df2ba4b731417796478c449e3e8f3d166ef21 (diff) | |
Merge remote-tracking branch 'remotes/origin/develop' into rider/bot_tattle
Fix conflicts
Diffstat (limited to 'indra/llinventory/llsaleinfo.cpp')
| -rw-r--r-- | indra/llinventory/llsaleinfo.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp index 98836b178e..35bbc1dbb1 100644 --- a/indra/llinventory/llsaleinfo.cpp +++ b/indra/llinventory/llsaleinfo.cpp @@ -89,8 +89,14 @@ bool LLSaleInfo::exportLegacyStream(std::ostream& output_stream) const LLSD LLSaleInfo::asLLSD() const { - LLSD sd = LLSD(); - sd["sale_type"] = lookup(mSaleType); + LLSD sd; + 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_price"] = mSalePrice; return sd; } |