aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llnotify.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-04-26 20:06:23 -0700
committerMcCabe Maxsted2010-04-26 20:06:23 -0700
commite563e2c2cc66fa9f3b47c4814d70f9800d957026 (patch)
treea2a9ca5bfeaf747b76b744f007da061ad15110c2 /linden/indra/newview/llnotify.cpp
parentMerge commit 'jacek/next' into next (diff)
downloadmeta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.zip
meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.tar.gz
meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.tar.bz2
meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.tar.xz
Ported currency changes from Hippo (#237) and fixed some labels Hippo missed (also fixed #200 in the process)
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llnotify.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index f8c3b30..a436d2d 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -56,6 +56,8 @@
56#include "lluictrlfactory.h" 56#include "lluictrlfactory.h"
57#include "llversionviewer.h" 57#include "llversionviewer.h"
58 58
59#include "hippoGridManager.h"
60
59// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0e) | Added: RLVa-0.2.0b 61// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
60#include "rlvhandler.h" 62#include "rlvhandler.h"
61// [/RLVa:KB] 63// [/RLVa:KB]
@@ -552,6 +554,10 @@ void LLNotifyBox::format(std::string& msg, const LLStringUtil::format_map_t& arg
552 // targs["[SECOND_LIFE]"] = LLNotifications::instance().getGlobalString("SECOND_LIFE"); 554 // targs["[SECOND_LIFE]"] = LLNotifications::instance().getGlobalString("SECOND_LIFE");
553 // targs["[VIEWER_NAME]"] = LLNotifications::instance().getGlobalString("VIEWER_NAME"); 555 // targs["[VIEWER_NAME]"] = LLNotifications::instance().getGlobalString("VIEWER_NAME");
554 556
557 //targs["[GRID_NAME]"] = gHippoGridManager->getConnectedGrid()->getGridName();
558 //targs["[GRID_SITE]"] = gHippoGridManager->getConnectedGrid()->getWebSite();
559 //targs["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
560
555 LLStringUtil::format(msg, targs); 561 LLStringUtil::format(msg, targs);
556} 562}
557 563