summaryrefslogtreecommitdiff
path: root/indra/newview/llpolymorph.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-01 17:39:08 -0400
committerOz Linden <oz@lindenlab.com>2011-04-01 17:39:08 -0400
commit1664c9dc678f7aca9c2bbf38d28e00550e03c4dd (patch)
tree9a51b54cd3a500e066c25e2c6180dd343ec639d9 /indra/newview/llpolymorph.h
parent2deea7c9d162b9bcae29e73fca8eebd26460fbf8 (diff)
parentf12d79907c7f002666291ab23dbb01ba715fa2c1 (diff)
merge out end-of-develop.py tag from viewer-development
Diffstat (limited to 'indra/newview/llpolymorph.h')
-rw-r--r--indra/newview/llpolymorph.h1
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; }