diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-02-01 02:23:35 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-02-01 02:23:35 +0000 |
| commit | b302f15deea0f4f7f5de75bfd3776c17021b6444 (patch) | |
| tree | 7a2842445c8dd6c8537bd9f8d4d171e95b85a845 /indra/newview/llvoavatar.h | |
| parent | 6ae0a9e2c1ac51385c341ff4a93384950e2e7e40 (diff) | |
EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> release
ACTUAL MERGE: merge maint-viewer-3-merge -r 79051 -> release
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 7ef9aee873..6f262a730a 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -845,7 +845,8 @@ public: static S32 sScratchTexBytes; // map of attachment points, by ID - LLPtrSkipMap<S32, LLViewerJointAttachment*> mAttachmentPoints; + typedef std::map<S32, LLViewerJointAttachment*> attachment_map_t; + attachment_map_t mAttachmentPoints; // xml parse tree of avatar config file static LLXmlTree sXMLTree; |