diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2016-10-17 15:27:38 +0000 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2016-10-17 15:27:38 +0000 |
| commit | c86967100c453ed35aca0ebbe57dd9dc9b85288f (patch) | |
| tree | a1d7ae7aa06cd2506640da833d8cd023ecbfd7fd /indra/newview/llviewerobject.h | |
| parent | 2540868bf38b39da4c94714f507941386e72da7c (diff) | |
| parent | b98bc258f23c3497a5c0605d1be56d44a058be88 (diff) | |
Merged in MAINT-6487
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 804b6c147b..1e8f3f4ec2 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -720,6 +720,7 @@ private: void deleteTEImages(); // correctly deletes list of images protected: + typedef std::map<char *, LLNameValue *> name_value_map_t; name_value_map_t mNameValuePairs; // Any name-value pairs stored by script @@ -756,9 +757,17 @@ protected: callback_list_t mInventoryCallbacks; S16 mInventorySerialNum; + enum EInventoryRequestState + { + INVENTORY_REQUEST_STOPPED, + INVENTORY_REQUEST_PENDING, + INVENTORY_XFER + }; + EInventoryRequestState mInvRequestState; + U64 mInvRequestXFerId; + BOOL mInventoryDirty; + LLViewerRegion *mRegionp; // Region that this object belongs to. - F64 mInvRequestExpireTime; - BOOL mInventoryDirty; BOOL mDead; BOOL mOrphaned; // This is an orphaned child BOOL mUserSelected; // Cached user select information |