diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2008-04-03 22:50:22 +0000 |
| commit | dc48f1c7417f0f49ad1bd32330845ce17a29eece (patch) | |
| tree | 8772aff5f32c1702228b7ca7e324fbd077269854 /indra/llcharacter | |
| parent | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (diff) | |
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.
QAR-448
Diffstat (limited to 'indra/llcharacter')
| -rw-r--r-- | indra/llcharacter/llstatemachine.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcharacter/llstatemachine.h b/indra/llcharacter/llstatemachine.h index c19a926dbb..5ae1668a11 100644 --- a/indra/llcharacter/llstatemachine.h +++ b/indra/llcharacter/llstatemachine.h @@ -54,7 +54,7 @@ class LLFSMTransition : public LLUniqueID { public: LLFSMTransition() : LLUniqueID(){}; - virtual std::string getName(){ return "unnamed"; } + virtual std::string getName()const { return "unnamed"; } }; class LLFSMState : public LLUniqueID @@ -64,7 +64,7 @@ public: virtual void onEntry(void *){}; virtual void onExit(void *){}; virtual void execute(void *){}; - virtual std::string getName(){ return "unnamed"; } + virtual std::string getName() const { return "unnamed"; } }; class LLStateDiagram |