diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-08-02 15:57:01 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-08-02 15:57:01 -0700 |
| commit | 4f6e814eaa7ae5cfc10e4e7d1f22e53be395a2f4 (patch) | |
| tree | be554f9f22996e00dada6da67f7e77eb0502b0f5 /indra/newview/llpreviewgesture.cpp | |
| parent | f423a69864c40f760c1c7e64a2e544fd1dba77fb (diff) | |
| parent | 15247f086989a43881d79c1ee5416bb00721eb68 (diff) | |
Fix the reversion imported from viewer-hotfix via: "hg pull -r 1c95812ba38b ../viewer-public" - reviewed by richard
Diffstat (limited to 'indra/newview/llpreviewgesture.cpp')
| -rw-r--r-- | indra/newview/llpreviewgesture.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp index 6f9d8a7623..a7b4873fed 100644 --- a/indra/newview/llpreviewgesture.cpp +++ b/indra/newview/llpreviewgesture.cpp @@ -1625,17 +1625,7 @@ std::string LLPreviewGesture::getLabel(std::vector<std::string> labels) result=LLTrans::getString("AnimFlagStart"); } - // lets localize action value - std::string action = v_labels[1]; - if ("None" == action) - { - action = LLTrans::getString("GestureActionNone"); - } - else if ("until animations are done" == action) - { - action = LLFloaterReg::getInstance("preview_gesture")->getChild<LLCheckBoxCtrl>("wait_anim_check")->getLabel(); - } - result.append(action); + result.append(v_labels[1]); return result; } |
