summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-04-26 14:07:09 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-04-26 14:07:09 -0400
commit0249a0d1e7564d06eadb8a23b0f058008dfd6068 (patch)
tree3553c0ca29f860279fb363e1a62c00158a35dca3 /indra/llcharacter
parentd6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff)
parent6d3be57d334f02f4781dcaede9746976bd3643a4 (diff)
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to 'indra/llcharacter')
-rw-r--r--indra/llcharacter/llcharacter.h2
1 files changed, 1 insertions, 1 deletions
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
//-------------------------------------------------------------------------