summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2009-12-14 12:49:48 +0200
committerMike Antipov <mantipov@productengine.com>2009-12-14 12:49:48 +0200
commitf446e2b94d05315a09e3068b258a606986ec8872 (patch)
tree10425cfdced0607e5df2375052e986c148a1b30d /indra/newview/skins
parentdfd1d698ea81873b45dc9927989cde232739498d (diff)
Fixed Normal bug EXT-3115 ("Unable to start new chat session" MissingString(generic))
-- added string with name="generic" with the same value as "generic_request_error" into strings.xml (because "generic" is a part of server's response body) --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8ac4ca95b9..00bbe71447 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2873,6 +2873,14 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="muted_message">
You have blocked this resident. Sending a message will automatically unblock them.
</string>
+ <!--Some times string name is getting from the body of server response.
+ For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post.
+ In case of the EXT-3115 issue 'generic' is passed into the gIMMgr::showSessionStartError as a string name.
+ Also there are some other places where "generic" is used.
+ So, let add string with name="generic" with the same value as "generic_request_error" -->
+ <string name="generic">
+ Error making request, please try again later.
+ </string>
<string name="generic_request_error">
Error making request, please try again later.
</string>