diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:04:33 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:04:33 -0500 |
| commit | 9e9d32de384b2807f195be48f49fbdec725f45d1 (patch) | |
| tree | 802158bd1a8872500ffeee286256f4c3ff79ef72 /indra/newview/llviewerobject.h | |
| parent | 3c276c87bde4ff9403df93434e8dc5309a3441b9 (diff) | |
| parent | defbd61d318d0da12fdea208cf2b2297d9a6b122 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index c8152e1539..dc102b666f 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -684,6 +684,10 @@ protected: F32 mAppAngle; // Apparent visual arc in degrees F32 mPixelArea; // Apparent area in pixels + // IDs of of all items in the object's content which are added to the object's content, + // but not updated on the server yet. After item was updated, its ID will be removed from this list. + std::list<LLUUID> mPendingInventoryItemsIDs; + // This is the object's inventory from the viewer's perspective. LLInventoryObject::object_list_t* mInventory; class LLInventoryCallbackInfo |