diff options
| author | leyla_linden <none@none> | 2011-01-19 11:37:42 -0800 | 
|---|---|---|
| committer | leyla_linden <none@none> | 2011-01-19 11:37:42 -0800 | 
| commit | b5e67321c3fa1e60e0973547372a5425e9d82efc (patch) | |
| tree | b3cb12bff7d89e2c1ba994e01e5d1e3c195105e0 /indra/newview | |
| parent | e9fd322febba11fa29a06c36df5f5d17f43a9da4 (diff) | |
SH-821 Selectively show/hide mesh render info
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 23 | 
1 files changed, 13 insertions, 10 deletions
| diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 96ee3f6180..dcfac012f6 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -506,18 +506,21 @@ public:  			ypos += y_inc; -			addText(xpos, ypos, llformat("%.3f MB Mesh Data Received", LLMeshRepository::sBytesReceived/(1024.f*1024.f))); -			 -			ypos += y_inc; -			 -			addText(xpos, ypos, llformat("%d/%d Mesh HTTP Requests/Retries", LLMeshRepository::sHTTPRequestCount, -				LLMeshRepository::sHTTPRetryCount)); -			 -			ypos += y_inc; +			if (gSavedSettings.getBOOL("MeshEnabled")) +			{ +				addText(xpos, ypos, llformat("%.3f MB Mesh Data Received", LLMeshRepository::sBytesReceived/(1024.f*1024.f))); +				 +				ypos += y_inc; +				 +				addText(xpos, ypos, llformat("%d/%d Mesh HTTP Requests/Retries", LLMeshRepository::sHTTPRequestCount, +					LLMeshRepository::sHTTPRetryCount)); +				 +				ypos += y_inc; -			addText(xpos, ypos, llformat("%.3f/%.3f MB Mesh Cache Read/Write ", LLMeshRepository::sCacheBytesRead/(1024.f*1024.f), LLMeshRepository::sCacheBytesWritten/(1024.f*1024.f))); +				addText(xpos, ypos, llformat("%.3f/%.3f MB Mesh Cache Read/Write ", LLMeshRepository::sCacheBytesRead/(1024.f*1024.f), LLMeshRepository::sCacheBytesWritten/(1024.f*1024.f))); -			ypos += y_inc; +				ypos += y_inc; +			}  			addText(xpos, ypos, llformat("Selection Triangle Count: %.3f Ktris ", LLSelectMgr::getInstance()->getSelection()->getSelectedObjectTriangleCount()/1000.f)); | 
