diff options
| author | David Seikel | 2011-04-26 21:30:21 +1000 |
|---|---|---|
| committer | David Seikel | 2011-04-26 21:30:21 +1000 |
| commit | da97e24c3b045d16589124496d032ffb9b4ca07f (patch) | |
| tree | 34d84cf4355f83e1a106d06a10ed2a4bb121fdc4 /linden/indra/llinventory | |
| parent | Apparently there is a wrong client tag for firestorm out in the wild. (diff) | |
| parent | Changed version to Experimental 2011.04.19 (diff) | |
| download | meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.zip meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.gz meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.bz2 meta-impy-da97e24c3b045d16589124496d032ffb9b4ca07f.tar.xz | |
Merge remote-tracking branch 'imprudence/exp' into exp
Conflicts (for future reference):
linden/indra/llcommon/llstring.cpp
linden/indra/newview/llpanelnetwork.cpp
linden/indra/newview/llselectmgr.cpp
linden/indra/newview/llstartup.cpp
linden/indra/newview/lltoolmgr.cpp
linden/indra/newview/llvoavatar.cpp
Diffstat (limited to 'linden/indra/llinventory')
| -rw-r--r-- | linden/indra/llinventory/lleconomy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llinventory/lleconomy.cpp b/linden/indra/llinventory/lleconomy.cpp index 4366d1e..2e98112 100644 --- a/linden/indra/llinventory/lleconomy.cpp +++ b/linden/indra/llinventory/lleconomy.cpp | |||
| @@ -44,7 +44,7 @@ LLGlobalEconomy::LLGlobalEconomy() | |||
| 44 | mPricePublicObjectDecay( -1 ), | 44 | mPricePublicObjectDecay( -1 ), |
| 45 | mPricePublicObjectDelete( -1 ), | 45 | mPricePublicObjectDelete( -1 ), |
| 46 | mPriceEnergyUnit( -1 ), | 46 | mPriceEnergyUnit( -1 ), |
| 47 | mPriceUpload( -1 ), | 47 | mPriceUpload( 0 ), |
| 48 | mPriceRentLight( -1 ), | 48 | mPriceRentLight( -1 ), |
| 49 | mTeleportMinPrice( -1 ), | 49 | mTeleportMinPrice( -1 ), |
| 50 | mTeleportPriceExponent( -1 ), | 50 | mTeleportPriceExponent( -1 ), |