summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-01-07 13:12:39 -0500
committerJonathan Yap <none@none>2011-01-07 13:12:39 -0500
commitc692b2bdb2e7c768649b4991f09d8dbc6f16fbc4 (patch)
tree0ea57ecb79f1292b989a57bdf7a3a61a0a8c2d01
parent09c01c4e925833873a83665fe0642637b65e547e (diff)
STORM-435 There is no space between name of object and value of object in Chat step while creating new gesture
-rw-r--r--doc/contributions.txt7
-rw-r--r--indra/newview/llpreviewgesture.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
3 files changed, 6 insertions, 5 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 3b14ce5125..8f0970bb39 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -364,15 +364,16 @@ JB Kraft
Joghert LeSabre
VWR-64
Jonathan Yap
- STORM-596
+ STORM-435
STORM-523
+ STORM-596
STORM-616
STORM-679
- STORM-737
STORM-726
+ STORM-737
+ STORM-785
STORM-812
VWR-17801
- STORM-785
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 : " />