diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-02-02 15:04:27 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-02-02 15:04:27 -0800 |
| commit | dca34a56d244d5e6ba5146dfd17882aeda04e241 (patch) | |
| tree | 0743a22d158247bd8675d9076bdff24d6b60aab6 | |
| parent | 7cac604dbdccfe1232e265d94afb6f99809f95ab (diff) | |
| parent | c692b2bdb2e7c768649b4991f09d8dbc6f16fbc4 (diff) | |
STORM-435 : pull into viewer-development
| -rw-r--r-- | doc/contributions.txt | 7 | ||||
| -rw-r--r-- | indra/newview/llpreviewgesture.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index c61ae66b13..8765240caa 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -373,22 +373,23 @@ JB Kraft Joghert LeSabre VWR-64 Jonathan Yap + STORM-435 STORM-523 STORM-596 STORM-615 STORM-616 + STORM-643 STORM-679 STORM-723 STORM-726 STORM-737 - STORM-869 STORM-785 STORM-812 STORM-829 + STORM-844 + STORM-869 VWR-17801 VWR-24347 - STORM-844 - STORM-643 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp index 16284d1a7e..8e5beb33ce 100644 --- a/indra/newview/llpreviewgesture.cpp +++ b/indra/newview/llpreviewgesture.cpp @@ -1597,7 +1597,7 @@ std::string LLPreviewGesture::getLabel(std::vector<std::string> labels) if(v_labels[0]=="Chat") { - result=LLTrans::getString("Chat"); + result=LLTrans::getString("Chat Message"); } else if(v_labels[0]=="Sound") { diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 752bb6ed3a..8f356e4169 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1948,7 +1948,7 @@ Requests name of an avatar. When data is available the dataserver event will be <!-- Gestures labels --> <!-- use value="" because they have preceding spaces --> - <string name="Chat" value=" Chat : " /> + <string name="Chat Message" value=" Chat : " /> <string name="Sound" value=" Sound : " /> <string name="Wait" value=" --- Wait : " /> <string name="AnimFlagStop" value=" Stop Animation : " /> |