diff options
author | Aleric Inglewood | 2010-10-23 22:59:56 +0200 |
---|---|---|
committer | Aleric Inglewood | 2010-10-23 22:59:56 +0200 |
commit | 95e77d7378654904990ea5cd9947cbc4dd40b386 (patch) | |
tree | 7e3fc082ae79ab43233d594a199910978c3a6d18 /linden/indra | |
parent | IMP-662: WARNING: LLVFS: Using index file /ramdisk/imprudence/cache/index.db2... (diff) | |
download | meta-impy-95e77d7378654904990ea5cd9947cbc4dd40b386.zip meta-impy-95e77d7378654904990ea5cd9947cbc4dd40b386.tar.gz meta-impy-95e77d7378654904990ea5cd9947cbc4dd40b386.tar.bz2 meta-impy-95e77d7378654904990ea5cd9947cbc4dd40b386.tar.xz |
IMP-663: WARNING: replaceSubstitutionStrings: replaceSubstituionStrings FAILURE: value: ignoretext repl:
Caused by missing ignoretext in notifications.xml. Also fixed typos in
debug output messages.
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/llui/llnotifications.cpp | 4 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/notifications.xml | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llui/llnotifications.cpp b/linden/indra/llui/llnotifications.cpp index 2459110..4d3ff46 100644 --- a/linden/indra/llui/llnotifications.cpp +++ b/linden/indra/llui/llnotifications.cpp | |||
@@ -1190,13 +1190,13 @@ void replaceSubstitutionStrings(LLXMLNodePtr node, StringMap& replacements) | |||
1190 | if (found != replacements.end()) | 1190 | if (found != replacements.end()) |
1191 | { | 1191 | { |
1192 | replacement = found->second; | 1192 | replacement = found->second; |
1193 | //llwarns << "replaceSubstituionStrings: value: " << value << " repl: " << replacement << llendl; | 1193 | //llinfos << "replaceSubstitutionStrings: value: \"" << value << "\" repl: \"" << replacement << "\"." << llendl; |
1194 | 1194 | ||
1195 | it->second->setValue(replacement); | 1195 | it->second->setValue(replacement); |
1196 | } | 1196 | } |
1197 | else | 1197 | else |
1198 | { | 1198 | { |
1199 | llwarns << "replaceSubstituionStrings FAILURE: value: " << value << " repl: " << replacement << llendl; | 1199 | llwarns << "replaceSubstitutionStrings FAILURE: could not find replacement \"" << value << "\"." << llendl; |
1200 | } | 1200 | } |
1201 | } | 1201 | } |
1202 | } | 1202 | } |
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml index 333e362..c69e792 100644 --- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml +++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml | |||
@@ -7008,6 +7008,7 @@ IM history could not be found for [NAME]. | |||
7008 | type="alert"> | 7008 | type="alert"> |
7009 | Show Look At is a debug setting that displays where an avatar's head is looking. Be aware: this will *NOT* show where an avatar's camera is actually pointed. This setting should not be relied on for any form of privacy! | 7009 | Show Look At is a debug setting that displays where an avatar's head is looking. Be aware: this will *NOT* show where an avatar's camera is actually pointed. This setting should not be relied on for any form of privacy! |
7010 | <usetemplate | 7010 | <usetemplate |
7011 | ignoretext="When setting Show Look At" | ||
7011 | name="okignore" | 7012 | name="okignore" |
7012 | yestext="OK"/> | 7013 | yestext="OK"/> |
7013 | </notification> | 7014 | </notification> |