diff options
| author | Don Kjer <don@lindenlab.com> | 2011-07-09 14:58:14 -0700 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-07-09 14:58:14 -0700 |
| commit | 7029c8ff534419a3bcfd0e5fc39a4739e4cdc19c (patch) | |
| tree | ad252385e65cd862ba42d57b282453af8cb12f73 /indra/newview/llmeshrepository.cpp | |
| parent | e63dd834ab84d740b242686d6e5315f7b47d03da (diff) | |
Fix for SH-2028. Also fixed layout issues with new upload warning and upload price text when floater is resized.
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 9e4b749ea1..6389f08f29 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -369,10 +369,8 @@ public: if (observer) { - S32 fee = cc["upload_price"].asInteger(); - F64 phys = cc["data"]["physics_cost"].asReal(); - - observer->onModelPhysicsFeeReceived(phys, fee, mThread->mWholeModelUploadURL); + cc["data"]["upload_price"] = cc["upload_price"]; + observer->onModelPhysicsFeeReceived(cc["data"], mThread->mWholeModelUploadURL); } } else |