diff options
author | Richard Linden <none@none> | 2011-04-06 15:15:33 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-04-06 15:15:33 -0700 |
commit | 75ddf612ad29240d6d34b5044ae09e4295217766 (patch) | |
tree | 70eeb78247ef3ae779809485afaaf592aa495b34 /indra/newview/llpolymorph.h | |
parent | 4dd471d055bea672f5eb21cfcc4d07e6b3ba3f9b (diff) | |
parent | 80efbeead1d59b64b615f8a33cb0966cf7fef9f1 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2
Diffstat (limited to 'indra/newview/llpolymorph.h')
-rw-r--r-- | indra/newview/llpolymorph.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpolymorph.h b/indra/newview/llpolymorph.h index bc111882b7..8a024f2e9e 100644 --- a/indra/newview/llpolymorph.h +++ b/indra/newview/llpolymorph.h @@ -46,6 +46,7 @@ class LLPolyMorphData public: LLPolyMorphData(const std::string& morph_name); ~LLPolyMorphData(); + LLPolyMorphData(const LLPolyMorphData &rhs); BOOL loadBinary(LLFILE* fp, LLPolyMeshSharedData *mesh); const std::string& getName() { return mName; } |