Commits

Anonymous committed 4ad8a3a

Fix merge issues - duplicate insertions of code

Comments (0)

Files changed (3)

indra/llrender/llvertexbuffer.cpp

 				allocate(dummy_name, size, true);
 			}
 		}
-		}
 	}
 }
 

indra/newview/llspatialpartition.cpp

 								{
 									llerrs << "Face texture index incorrect." << llendl;
 								}
-								}
 							}
 						}
 					}

indra/newview/llviewerobject.h

 	// 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