From 487ca1bad37883be0325b564ab557a8f77575388 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Wed, 14 May 2014 17:50:59 -0400
Subject: v-r -> s-e merge WIP

---
 indra/llinventory/llinventory.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llinventory')

diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index 443d34e145..70b200e139 100755
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -48,6 +48,7 @@ class LLInventoryObject : public LLRefCount, public LLTrace::MemTrackable<LLInve
 {
 public:
 	typedef std::list<LLPointer<LLInventoryObject> > object_list_t;
+	typedef std::list<LLConstPointer<LLInventoryObject> > const_object_list_t;
 
 	//--------------------------------------------------------------------
 	// Initialization
-- 
cgit v1.2.3