Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2012-01-11 02:28:14 -05:00
parent c5d4ccc78d ced937cc46
commit 8543106f5e
31 changed files with 504 additions and 321 deletions
--- a/indra/newview/llpanelinventory.cpp
+++ b/indra/newview/llpanelinventory.cpp
@@ -245,7 +245,6 @@ void LLTaskInvFVBridge::buyItem()
 	{
        LLSD args;
        args["PRICE"] = llformat("%d",sale_info.getSalePrice());
-        args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
        args["OWNER"] = owner_name;
        if (sale_info.getSaleType() != LLSaleInfo::FS_CONTENTS)
        {