diff options
| author | callum <none@none> | 2012-06-29 10:36:04 -0700 |
|---|---|---|
| committer | callum <none@none> | 2012-06-29 10:36:04 -0700 |
| commit | 11686a0917c7e6e67920aca46ade4624c5027c0e (patch) | |
| tree | 69f56b63cf711b6aef97e0b06d981e5c8087375a /indra/newview/llviewerobject.h | |
| parent | fd4708c2c4f221d9f2029072f786e169e119ba1a (diff) | |
| parent | 326634e1bf9b87e9c9311b67539abb43323bd33c (diff) | |
Merge with viewer-beta
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 |