diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 18:58:35 -0700 |
| commit | 1bfdfcb7b9dd392459b012b0712237716c94a84c (patch) | |
| tree | bdc4dfb4ef49c209acbdc3e9dd633a5a8a29dbba /indra/llcharacter | |
| parent | ab954444154de43ee18575a3b0649d0f3045dfd8 (diff) | |
| parent | dab5ef9d881bc41bc4924102c939db25dd26e0d9 (diff) | |
Merge pull from vir/drano
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llbvhloader.cpp | 2 | ||||
| -rw-r--r-- | indra/llcharacter/llcharacter.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp index f3cf950afa..2a0df26384 100644 --- a/indra/llcharacter/llbvhloader.cpp +++ b/indra/llcharacter/llbvhloader.cpp @@ -1570,7 +1570,7 @@ BOOL LLBVHLoader::serialize(LLDataPacker& dp) constraint_it++) { U8 byte = constraint_it->mChainLength; - dp.packU8(byte, "chain_lenght"); + dp.packU8(byte, "chain_length"); byte = constraint_it->mConstraintType; dp.packU8(byte, "constraint_type"); diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h index e81a27c2bc..3ebb2bffb0 100644 --- a/indra/llcharacter/llcharacter.h +++ b/indra/llcharacter/llcharacter.h @@ -126,7 +126,7 @@ public: virtual void addDebugText( const std::string& text ) = 0; - virtual const LLUUID& getID() = 0; + virtual const LLUUID& getID() const = 0; //------------------------------------------------------------------------- // End Interface //------------------------------------------------------------------------- |