summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-05-14 17:50:59 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-05-14 17:50:59 -0400
commit487ca1bad37883be0325b564ab557a8f77575388 (patch)
treea8e7c6163d18f41161f5477c8af31207d2b4eae2 /indra/llinventory
parent7b9708a2e3aede6faef04bd546c497dc68264f58 (diff)
v-r -> s-e merge WIP
Diffstat (limited to 'indra/llinventory')
-rwxr-xr-xindra/llinventory/llinventory.h1
1 files changed, 1 insertions, 0 deletions
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