diff options
| author | McCabe Maxsted | 2009-01-12 15:33:52 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-01-12 15:33:52 -0700 |
| commit | 2258733ba2adffbedd8104e1a7d9e762a578054e (patch) | |
| tree | bfd25c7d90ff580c183fa0d75c41248c574428fa /linden/indra/llinventory | |
| parent | Added inventory changes to fix one method of inventory loss. (diff) | |
| download | meta-impy-2258733ba2adffbedd8104e1a7d9e762a578054e.zip meta-impy-2258733ba2adffbedd8104e1a7d9e762a578054e.tar.gz meta-impy-2258733ba2adffbedd8104e1a7d9e762a578054e.tar.bz2 meta-impy-2258733ba2adffbedd8104e1a7d9e762a578054e.tar.xz | |
Updated changes to LLSD.
Diffstat (limited to 'linden/indra/llinventory')
| -rw-r--r-- | linden/indra/llinventory/llsaleinfo.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/linden/indra/llinventory/llsaleinfo.cpp b/linden/indra/llinventory/llsaleinfo.cpp index 4895378..fef6b05 100644 --- a/linden/indra/llinventory/llsaleinfo.cpp +++ b/linden/indra/llinventory/llsaleinfo.cpp | |||
| @@ -114,7 +114,16 @@ bool LLSaleInfo::fromLLSD(LLSD& sd, BOOL& has_perm_mask, U32& perm_mask) | |||
| 114 | { | 114 | { |
| 115 | const char *w; | 115 | const char *w; |
| 116 | 116 | ||
| 117 | mSaleType = lookup(sd["sale_type"].asString().c_str()); | 117 | if (sd["sale_type"].isString()) |
| 118 | { | ||
| 119 | mSaleType = lookup(sd["sale_type"].asString().c_str()); | ||
| 120 | } | ||
| 121 | else if(sd["sale_type"].isInteger()) | ||
| 122 | { | ||
| 123 | S8 type = (U8)sd["sale_type"].asInteger(); | ||
| 124 | mSaleType = static_cast<LLSaleInfo::EForSale>(type); | ||
| 125 | } | ||
| 126 | |||
| 118 | mSalePrice = llclamp(sd["sale_price"].asInteger(), 0, S32_MAX); | 127 | mSalePrice = llclamp(sd["sale_price"].asInteger(), 0, S32_MAX); |
| 119 | w = "perm_mask"; | 128 | w = "perm_mask"; |
| 120 | if (sd.has(w)) | 129 | if (sd.has(w)) |