diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-11 17:14:25 -0700 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-11 17:14:25 -0700 |
| commit | 56d563ba7f8ed4a6284627c36f9c55935b7a9ff2 (patch) | |
| tree | aec7f5064a41c8a7dcb8c6a16aa4b4325521402b /indra/newview | |
| parent | 173d0fa213f59b872a4a6c34b8668c67b58fdca7 (diff) | |
Fix merge issues - duplicate insertions of code
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.h | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 86de80b47d..78c905f6ff 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -4199,7 +4199,6 @@ public: { llerrs << "Face texture index incorrect." << llendl; } - } } } } diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 03b50c649e..30c3d03635 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -693,10 +693,6 @@ protected: // but not updated on the server yet. After item was updated, its ID will be removed from this list. std::list<LLUUID> mPendingInventoryItemsIDs; - // 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 |