aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcharacter
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:42 -0500
committerJacek Antonelli2008-08-15 23:45:42 -0500
commitce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
treeef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/llcharacter
parentSecond Life viewer sources 1.19.1.4b (diff)
downloadmeta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/llcharacter')
-rw-r--r--linden/indra/llcharacter/lljoint.cpp9
-rw-r--r--linden/indra/llcharacter/llstatemachine.h4
2 files changed, 7 insertions, 6 deletions
diff --git a/linden/indra/llcharacter/lljoint.cpp b/linden/indra/llcharacter/lljoint.cpp
index b7a51f1..4611f52 100644
--- a/linden/indra/llcharacter/lljoint.cpp
+++ b/linden/indra/llcharacter/lljoint.cpp
@@ -189,11 +189,12 @@ void LLJoint::removeChild(LLJoint* joint)
189 child_list_t::iterator iter = std::find(mChildren.begin(), mChildren.end(), joint); 189 child_list_t::iterator iter = std::find(mChildren.begin(), mChildren.end(), joint);
190 if (iter != mChildren.end()) 190 if (iter != mChildren.end())
191 { 191 {
192 this->mChildren.erase(iter); 192 mChildren.erase(iter);
193
194 joint->mXform.setParent(NULL);
195 joint->mParent = NULL;
196 joint->touch();
193 } 197 }
194 joint->mXform.setParent(NULL);
195 joint->mParent = NULL;
196 joint->touch();
197} 198}
198 199
199 200
diff --git a/linden/indra/llcharacter/llstatemachine.h b/linden/indra/llcharacter/llstatemachine.h
index 12a71b7..873e938 100644
--- a/linden/indra/llcharacter/llstatemachine.h
+++ b/linden/indra/llcharacter/llstatemachine.h
@@ -54,7 +54,7 @@ class LLFSMTransition : public LLUniqueID
54{ 54{
55public: 55public:
56 LLFSMTransition() : LLUniqueID(){}; 56 LLFSMTransition() : LLUniqueID(){};
57 virtual std::string getName(){ return "unnamed"; } 57 virtual std::string getName()const { return "unnamed"; }
58}; 58};
59 59
60class LLFSMState : public LLUniqueID 60class LLFSMState : public LLUniqueID
@@ -64,7 +64,7 @@ public:
64 virtual void onEntry(void *){}; 64 virtual void onEntry(void *){};
65 virtual void onExit(void *){}; 65 virtual void onExit(void *){};
66 virtual void execute(void *){}; 66 virtual void execute(void *){};
67 virtual std::string getName(){ return "unnamed"; } 67 virtual std::string getName() const { return "unnamed"; }
68}; 68};
69 69
70class LLStateDiagram 70class LLStateDiagram