summaryrefslogtreecommitdiff
path: root/indra/llcharacter
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2010-06-21 12:20:24 -0400
committerNat Goodspeed <nat@lindenlab.com>2010-06-21 12:20:24 -0400
commitf17623d8c67a10c2d7547e40ac8442c703d107ed (patch)
tree2ae37385da280a758a66e920f9bdb317dcde59ee /indra/llcharacter
parent4e538adca41d486125c3b887ce694c457bcab157 (diff)
parentbef22c0325cbfeb3d290753a66ecf862bf4593d3 (diff)
Automated merge with ssh://192.168.2.107/c:/linden/viewer-release/
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;
}