summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-26 17:06:07 -0400
committerOz Linden <oz@lindenlab.com>2012-05-26 17:06:07 -0400
commita4913246770b58ed569021c484c213231aaae549 (patch)
tree0878deeaa86b2c3a28cbf325566e8489111523c1 /indra/llcharacter
parent80c2abddcfbcb578e70d220baa95aebdee3d529c (diff)
parentb2b446aed7f7f32151bc152ba25d44253ebf864f (diff)
merge up to latest 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
//-------------------------------------------------------------------------