summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-02-02 15:04:27 -0800
committerMerov Linden <merov@lindenlab.com>2011-02-02 15:04:27 -0800
commitdca34a56d244d5e6ba5146dfd17882aeda04e241 (patch)
tree0743a22d158247bd8675d9076bdff24d6b60aab6 /indra
parent7cac604dbdccfe1232e265d94afb6f99809f95ab (diff)
parentc692b2bdb2e7c768649b4991f09d8dbc6f16fbc4 (diff)
STORM-435 : pull into viewer-development
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpreviewgesture.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
2 files changed, 2 insertions, 2 deletions
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 : " />