diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-02-03 17:56:26 +0000 |
| commit | e188badaf29a1a02307f93864eed6737096bd9a1 (patch) | |
| tree | 767259ad3385fd9ede9722e04752bea008469f8c /indra/llinventory/lleconomy.cpp | |
| parent | 4ad54702fce32905402cb6055c085ac14de188a2 (diff) | |
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314
Whew.
Diffstat (limited to 'indra/llinventory/lleconomy.cpp')
| -rw-r--r-- | indra/llinventory/lleconomy.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/llinventory/lleconomy.cpp b/indra/llinventory/lleconomy.cpp index ad37c0c27a..4366d1eb2a 100644 --- a/indra/llinventory/lleconomy.cpp +++ b/indra/llinventory/lleconomy.cpp @@ -74,6 +74,18 @@ void LLGlobalEconomy::processEconomyData(LLMessageSystem *msg, LLGlobalEconomy* econ_data->setPricePublicObjectDelete(i); msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceUpload, i); econ_data->setPriceUpload(i); +#if LL_LINUX + // We can optionally fake the received upload price for testing. + // Note that the server is within its rights to not obey our fake + // price. :) + const char* fakeprice_str = getenv("LL_FAKE_UPLOAD_PRICE"); + if (fakeprice_str) + { + S32 fakeprice = (S32)atoi(fakeprice_str); + llwarns << "LL_FAKE_UPLOAD_PRICE: Faking upload price as L$" << fakeprice << llendl; + econ_data->setPriceUpload(fakeprice); + } +#endif msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceRentLight, i); econ_data->setPriceRentLight(i); msg->getS32Fast(_PREHASH_Info, _PREHASH_TeleportMinPrice, i); |