summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewerobject.h')
-rw-r--r--indra/newview/llviewerobject.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index c11c3c891e..38744c35cf 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -34,7 +34,6 @@
#include <map>
-#include "linked_lists.h"
#include "llassetstorage.h"
#include "lldarrayptr.h"
#include "llhudtext.h"
@@ -591,7 +590,8 @@ protected:
LLVOInventoryListener* mListener;
void* mInventoryData;
};
- LLLinkedList<LLInventoryCallbackInfo> mInventoryCallbacks;
+ typedef std::list<LLInventoryCallbackInfo*> callback_list_t;
+ callback_list_t mInventoryCallbacks;
S16 mInventorySerialNum;
LLViewerRegion *mRegionp; // Region that this object belongs to.