summaryrefslogtreecommitdiff
path: root/indra/llcharacter/llmultigesture.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-06-21 11:24:33 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-06-21 11:24:33 -0700
commitb088449517c7070ba15b6e344dbc7a1145f64dac (patch)
tree66562b72586081f59fa74e9baaedf560ff49ffd5 /indra/llcharacter/llmultigesture.cpp
parent4bf8a0c7fca329ce1d0c58bc3ebf86fbbe544d40 (diff)
parentbb95afc9e1246abfc3656b31b33d1e5ae1dc85f2 (diff)
Merge from ssh://hg.lindenlab.com/dessie/viewer-release
Diffstat (limited to 'indra/llcharacter/llmultigesture.cpp')
-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;
}