From 56d563ba7f8ed4a6284627c36f9c55935b7a9ff2 Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Wed, 11 Jul 2012 17:14:25 -0700
Subject: [PATCH] Fix merge issues - duplicate insertions of code
---
indra/llrender/llvertexbuffer.cpp | 1 -
indra/newview/llspatialpartition.cpp | 1 -
indra/newview/llviewerobject.h | 4 ----
3 files changed, 6 deletions(-)
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index ece794b7f1e..739b31204d2 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -286,7 +286,6 @@ void LLVBOPool::seedPool()
allocate(dummy_name, size, true);
}
}
- }
}
}
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 86de80b47dd..78c905f6ffb 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -4199,7 +4199,6 @@ class LLOctreeRenderNonOccluded : public LLOctreeTraveler<LLDrawable>
{
llerrs << "Face texture index incorrect." << llendl;
}
- }
}
}
}
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 03b50c649e9..30c3d036354 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -693,10 +693,6 @@ class LLViewerObject : public LLPrimitive, public LLRefCount, public LLGLUpdate
// 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
--
GitLab