From 9dfe0ca9a0228c4fa75c8a3e51840696cc6b4960 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Fri, 22 May 2009 09:58:47 +0000 Subject: svn merge -r121194:121210 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1 QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk --- indra/newview/llcurrencyuimanager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/newview/llcurrencyuimanager.cpp') diff --git a/indra/newview/llcurrencyuimanager.cpp b/indra/newview/llcurrencyuimanager.cpp index 71ecca5d41..86821249a0 100644 --- a/indra/newview/llcurrencyuimanager.cpp +++ b/indra/newview/llcurrencyuimanager.cpp @@ -121,7 +121,8 @@ LLCurrencyUIManager::Impl::Impl(LLPanel& dialog) : mPanel(dialog), mHidden(false), mError(false), - mUserCurrencyBuy(1000), mUserEnteredCurrencyBuy(false), + mUserCurrencyBuy(2000), // note, this is a default, real value set in llfloaterbuycurrency.cpp + mUserEnteredCurrencyBuy(false), mSiteCurrencyEstimated(false), mSiteCurrencyEstimatedCost(0), mBought(false), -- cgit v1.2.3 From 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Sun, 21 Jun 2009 08:04:56 +0000 Subject: merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 ignore-dead-branch --- indra/newview/llcurrencyuimanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llcurrencyuimanager.cpp') diff --git a/indra/newview/llcurrencyuimanager.cpp b/indra/newview/llcurrencyuimanager.cpp index 86821249a0..9957694727 100644 --- a/indra/newview/llcurrencyuimanager.cpp +++ b/indra/newview/llcurrencyuimanager.cpp @@ -46,6 +46,7 @@ #include "llviewchildren.h" #include "llxmlrpctransaction.h" #include "llviewernetwork.h" +#include "llpanel.h" const F64 CURRENCY_ESTIMATE_FREQUENCY = 2.0; @@ -356,8 +357,7 @@ void LLCurrencyUIManager::Impl::prepare() if (lindenAmount) { lindenAmount->setPrevalidate(LLLineEditor::prevalidateNonNegativeS32); - lindenAmount->setKeystrokeCallback(onCurrencyKey); - lindenAmount->setCallbackUserData(this); + lindenAmount->setKeystrokeCallback(onCurrencyKey, this); } } -- cgit v1.2.3