summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-06-21 11:51:06 +0300
committerMike Antipov <mantipov@productengine.com>2010-06-21 11:51:06 +0300
commit26fe6e1df5371e889e9c0c5d0b6eba086ba1c7ac (patch)
tree57c181955f356118b0622ecc9c5c132d092b6a4c /indra/llcharacter
parentca816088999d130b2f36a287b1d33d02cea6ce30 (diff)
parentff2c3873817c6ab701483dbdda656af5e038f0a6 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llcharacter')
-rw-r--r--indra/llcharacter/llmultigesture.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcharacter/llmultigesture.cpp b/indra/llcharacter/llmultigesture.cpp
index 05d1bc0cd9..ee60430d97 100644
--- a/indra/llcharacter/llmultigesture.cpp
+++ b/indra/llcharacter/llmultigesture.cpp
@@ -498,6 +498,10 @@ std::vector<std::string> LLGestureStepWait::getLabel() const
strings.push_back("until animations are done");
// label += "until animations are done";
}
+ else
+ {
+ strings.push_back("");
+ }
return strings;
}