diff options
| author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
| commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
| tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/llviewerstats.cpp | |
| parent | Second Life viewer sources 1.19.0.5 (diff) | |
| download | meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2 meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz | |
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/llviewerstats.cpp')
| -rw-r--r-- | linden/indra/newview/llviewerstats.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewerstats.cpp b/linden/indra/newview/llviewerstats.cpp index ea24d9e..dabc971 100644 --- a/linden/indra/newview/llviewerstats.cpp +++ b/linden/indra/newview/llviewerstats.cpp | |||
| @@ -537,7 +537,7 @@ void update_statistics(U32 frame_count) | |||
| 537 | gViewerStats->setStat(LLViewerStats::ST_UPDATE_SECS, idle_secs - network_secs); | 537 | gViewerStats->setStat(LLViewerStats::ST_UPDATE_SECS, idle_secs - network_secs); |
| 538 | gViewerStats->setStat(LLViewerStats::ST_NETWORK_SECS, network_secs); | 538 | gViewerStats->setStat(LLViewerStats::ST_NETWORK_SECS, network_secs); |
| 539 | gViewerStats->setStat(LLViewerStats::ST_IMAGE_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_IMAGE_UPDATE)); | 539 | gViewerStats->setStat(LLViewerStats::ST_IMAGE_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_IMAGE_UPDATE)); |
| 540 | gViewerStats->setStat(LLViewerStats::ST_REBUILD_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_REBUILD)); | 540 | gViewerStats->setStat(LLViewerStats::ST_REBUILD_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_STATESORT )); |
| 541 | gViewerStats->setStat(LLViewerStats::ST_RENDER_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_RENDER_GEOMETRY)); | 541 | gViewerStats->setStat(LLViewerStats::ST_RENDER_SECS, gDebugView->mFastTimerView->getTime(LLFastTimer::FTM_RENDER_GEOMETRY)); |
| 542 | 542 | ||
| 543 | LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit(gAgent.getRegion()->getHost()); | 543 | LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit(gAgent.getRegion()->getHost()); |
| @@ -704,11 +704,11 @@ void send_stats() | |||
| 704 | std::string gpu_desc = llformat( | 704 | std::string gpu_desc = llformat( |
| 705 | "%-6s Class %d ", | 705 | "%-6s Class %d ", |
| 706 | gGLManager.mGLVendorShort.substr(0,6).c_str(), | 706 | gGLManager.mGLVendorShort.substr(0,6).c_str(), |
| 707 | gFeatureManagerp->getGPUClass()) | 707 | (S32)gFeatureManagerp->getGPUClass()) |
| 708 | + gFeatureManagerp->getGPUString(); | 708 | + gFeatureManagerp->getGPUString(); |
| 709 | 709 | ||
| 710 | system["gpu"] = gpu_desc; | 710 | system["gpu"] = gpu_desc; |
| 711 | system["gpu_class"] = gFeatureManagerp->getGPUClass(); | 711 | system["gpu_class"] = (S32)gFeatureManagerp->getGPUClass(); |
| 712 | system["gpu_vendor"] = gGLManager.mGLVendorShort; | 712 | system["gpu_vendor"] = gGLManager.mGLVendorShort; |
| 713 | system["gpu_version"] = gGLManager.mDriverVersionVendorString; | 713 | system["gpu_version"] = gGLManager.mDriverVersionVendorString; |
| 714 | 714 | ||