diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-11 11:34:20 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-11 11:34:20 -0400 |
| commit | 6221162ab786a7bf03b55278d41731aec06b8150 (patch) | |
| tree | 0f5e5aa1a35453e0e7d79ce9487a4bf83bcaea0c | |
| parent | 48222564def4534b157f91e36a10c4df79010bfc (diff) | |
| parent | 80e60371f8be32719dd19467fd2def80e994aa2d (diff) | |
merge
| -rwxr-xr-x | indra/newview/llfloatermodelpreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 0939e7bbbf..80a9b8f781 100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -3081,7 +3081,7 @@ U32 LLModelPreview::calcResourceCost() updateStatusMessages(); - return streaming_cost; + return (U32) streaming_cost; } void LLFloaterModelPreview::setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost) |