aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llgivemoney.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2010-01-09 15:36:34 -0600
committerJacek Antonelli2010-01-31 02:22:09 -0600
commitced750d70538b846b5943c4ca1541c3fa7d14630 (patch)
tree521816b1c714e73c28b06277e5193448f2dd6e86 /linden/indra/newview/llgivemoney.cpp
parentImplemented VWR-9597 (optional message when paying someone). (diff)
downloadmeta-impy-ced750d70538b846b5943c4ca1541c3fa7d14630.zip
meta-impy-ced750d70538b846b5943c4ca1541c3fa7d14630.tar.gz
meta-impy-ced750d70538b846b5943c4ca1541c3fa7d14630.tar.bz2
meta-impy-ced750d70538b846b5943c4ca1541c3fa7d14630.tar.xz
Improved "Pay Resident" floater layout and XML.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llgivemoney.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/linden/indra/newview/llgivemoney.cpp b/linden/indra/newview/llgivemoney.cpp
index ed67c97..849787f 100644
--- a/linden/indra/newview/llgivemoney.cpp
+++ b/linden/indra/newview/llgivemoney.cpp
@@ -147,7 +147,9 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
147 ++i; 147 ++i;
148 148
149 149
150 childSetVisible("amount text", FALSE); 150 childSetVisible("amount text", FALSE);
151 childSetVisible("currency text", FALSE);
152
151 153
152 std::string last_amount; 154 std::string last_amount;
153 if(sLastAmount > 0) 155 if(sLastAmount > 0)
@@ -155,7 +157,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
155 last_amount = llformat("%d", sLastAmount); 157 last_amount = llformat("%d", sLastAmount);
156 } 158 }
157 159
158 childSetVisible("amount", FALSE); 160 childSetVisible("amount", FALSE);
159 161
160 childSetKeystrokeCallback("amount", &LLFloaterPay::onKeystroke, this); 162 childSetKeystrokeCallback("amount", &LLFloaterPay::onKeystroke, this);
161 childSetText("amount", last_amount); 163 childSetText("amount", last_amount);
@@ -207,12 +209,15 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
207 self->childSetVisible("amount", FALSE); 209 self->childSetVisible("amount", FALSE);
208 self->childSetVisible("pay btn", FALSE); 210 self->childSetVisible("pay btn", FALSE);
209 self->childSetVisible("amount text", FALSE); 211 self->childSetVisible("amount text", FALSE);
212 self->childSetVisible("currency text", FALSE);
213
210 } 214 }
211 else if (PAY_PRICE_DEFAULT == price) 215 else if (PAY_PRICE_DEFAULT == price)
212 { 216 {
213 self->childSetVisible("amount", TRUE); 217 self->childSetVisible("amount", TRUE);
214 self->childSetVisible("pay btn", TRUE); 218 self->childSetVisible("pay btn", TRUE);
215 self->childSetVisible("amount text", TRUE); 219 self->childSetVisible("amount text", TRUE);
220 self->childSetVisible("currency text", TRUE);
216 } 221 }
217 else 222 else
218 { 223 {
@@ -223,6 +228,7 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
223 self->childSetVisible("pay btn", TRUE); 228 self->childSetVisible("pay btn", TRUE);
224 self->childSetEnabled("pay btn", TRUE); 229 self->childSetEnabled("pay btn", TRUE);
225 self->childSetVisible("amount text", TRUE); 230 self->childSetVisible("amount text", TRUE);
231 self->childSetVisible("currency text", TRUE);
226 232
227 self->childSetText("amount", llformat("%d", llabs(price))); 233 self->childSetText("amount", llformat("%d", llabs(price)));
228 } 234 }
@@ -362,6 +368,7 @@ void LLFloaterPay::payDirectly(money_callback callback,
362 floater->childSetVisible("amount", TRUE); 368 floater->childSetVisible("amount", TRUE);
363 floater->childSetVisible("pay btn", TRUE); 369 floater->childSetVisible("pay btn", TRUE);
364 floater->childSetVisible("amount text", TRUE); 370 floater->childSetVisible("amount text", TRUE);
371 floater->childSetVisible("currency text", TRUE);
365 372
366 floater->childSetVisible("fastpay text",TRUE); 373 floater->childSetVisible("fastpay text",TRUE);
367 for(S32 i=0;i<MAX_PAY_BUTTONS;++i) 374 for(S32 i=0;i<MAX_PAY_BUTTONS;++i)