diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2009-07-22 17:30:16 +0000 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2009-07-22 17:30:16 +0000 |
commit | 858f7846715f5182ed9b5e8da7f98ae972297b10 (patch) | |
tree | bddcd7adb3fea335dac221a8b756c3dd6b2157a0 /indra/llinventory/llparcel.h | |
parent | c15b6d7d40ac03957b417cbe0e67d9c1bfa7703f (diff) |
Merge of Parcel API V1 to trunk for 1.30 release. Hallelujah!
QAR-1687 Merge request for Parcel API project for 1.30 release
svn merge -r127262:127300 svn+ssh://svn/svn/linden/branches/parcel-api/merge-qar-1687-parcel-api-2 trunk
Diffstat (limited to 'indra/llinventory/llparcel.h')
-rw-r--r-- | indra/llinventory/llparcel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index 40bbb7b2e0..5ba32c0600 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -135,9 +135,9 @@ class LLSD; class LLAccessEntry { public: - LLUUID mID; - S32 mTime; - U32 mFlags; + LLUUID mID; // Agent ID + S32 mTime; // Time (unix seconds) when entry expires + U32 mFlags; // Not used - currently should always be zero }; typedef std::map<LLUUID,LLAccessEntry>::iterator access_map_iterator; |