diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-16 00:57:46 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-16 00:57:46 +0000 |
| commit | db0f5847ea8b96b3c1ac08e7aeb43d83daacb8e4 (patch) | |
| tree | b7ccec1733db9054076708698c10d3e74b8f55da /indra/llinventory | |
| parent | 8eea75dc3f4138a0b216e8d662089d2c930d5d45 (diff) | |
svn merge -r 80024:80160 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server
Port fixes for:
* DEV-10609 Checkboxes in About Land untick when selected
* Extend the sim node regex to support sim1-telstra.durga.lindenlab.com for colo testing.
* Provide "version_valid" for each version when querying a channel
* Update to latest eventlet r87, to handle multi-character terminators split across read buffers
* DEV-10487 Log viewer stats sim and php fix
* QAR-288: Pull in crash fixes from LSL bytecode parsing
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llparcel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 792bb1be90..7a84e1916f 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -1337,7 +1337,7 @@ void LLParcel::packMessage(LLMessageSystem* msg) void LLParcel::packMessage(LLSD& msg) { msg["local_id"] = getLocalID(); - msg["flags"] = ll_sd_from_U32(getParcelFlags()); + msg["parcel_flags"] = ll_sd_from_U32(getParcelFlags()); msg["sale_price"] = getSalePrice(); msg["name"] = getName(); msg["description"] = getDesc(); @@ -1362,6 +1362,7 @@ void LLParcel::packMessage(LLSD& msg) msg["user_location"] = ll_sd_from_vector3(mUserLocation); msg["user_look_at"] = ll_sd_from_vector3(mUserLookAt); msg["landing_type"] = (U8)mLandingType; + } |