Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2014-05-08 19:57:01 -04:00
parent 1fa30dd337 f0763fd31c
commit 656eacbb09
17 changed files with 171 additions and 199 deletions
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -1288,7 +1288,7 @@ public:
            LL_CONT << "slowest framerate for last " << int(prevSize * MEM_INFO_THROTTLE)
                    << " seconds ";
        }
-        LL_CONT << std::fixed << std::setprecision(1) << framerate << '\n'
+        LL_CONT << std::fixed << std::setprecision(1) << framerate << std::setprecision(6) << '\n'
                << LLMemoryInfo() << LL_ENDL;

        return false;