aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llnotify.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-11-08 13:23:54 -0700
committerMcCabe Maxsted2009-11-08 13:23:54 -0700
commitd9ecd6fde8f588d8be9a54a3ebc301bab1e99754 (patch)
tree1f595f7577a5134b29e4933d1ce6b4b52e9c1f57 /linden/indra/newview/llnotify.cpp
parentMerged working branch of 1.2 into LL 1.23 merge (diff)
parentChanged version to 1.20 in other files (diff)
downloadmeta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.zip
meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.gz
meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.bz2
meta-impy-d9ecd6fde8f588d8be9a54a3ebc301bab1e99754.tar.xz
Merged almost-final version of Imprudence 1.2 into 1.3
Diffstat (limited to 'linden/indra/newview/llnotify.cpp')
-rw-r--r--linden/indra/newview/llnotify.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index 6820622..6da3b97 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -54,6 +54,7 @@
54#include "llfloaterchat.h" // for add_chat_history() 54#include "llfloaterchat.h" // for add_chat_history()
55#include "lloverlaybar.h" // for gOverlayBar 55#include "lloverlaybar.h" // for gOverlayBar
56#include "lluictrlfactory.h" 56#include "lluictrlfactory.h"
57#include "llversionviewer.h"
57 58
58// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0e) | Added: RLVa-0.2.0b 59// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
59#include "rlvhandler.h" 60#include "rlvhandler.h"
@@ -546,6 +547,7 @@ void LLNotifyBox::format(std::string& msg, const LLStringUtil::format_map_t& arg
546 // XUI:translate! 547 // XUI:translate!
547 LLStringUtil::format_map_t targs = args; 548 LLStringUtil::format_map_t targs = args;
548 targs["[SECOND_LIFE]"] = "Second Life"; 549 targs["[SECOND_LIFE]"] = "Second Life";
550 targs["[VIEWER]"] = IMP_VIEWER_NAME;
549 LLStringUtil::format(msg, targs); 551 LLStringUtil::format(msg, targs);
550} 552}
551 553