diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-04-11 14:07:34 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-04-11 14:07:34 -0600 |
| commit | 0a3d29c6b415ef8d22f4b86fadbde370a51d0f46 (patch) | |
| tree | 4666f992e0d0cc748a769facf169ad2b3a931a89 /indra/newview/llscenemonitor.cpp | |
| parent | faebbb23f87a855463aba611ca8944ec7f4e0a9c (diff) | |
| parent | 81943ecbe53779a226da4bbdf2c8b1ae39eba11b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llscenemonitor.cpp')
| -rw-r--r-- | indra/newview/llscenemonitor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index c06d9d2689..15fe77f028 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -523,7 +523,7 @@ void LLSceneMonitor::addMonitorResult() //dump results to a file _scene_monitor_results.csv void LLSceneMonitor::dumpToFile(std::string file_name) { - if(mMonitorResults.empty()) + if(mMonitorResults.empty() || !getRecording()) { return; //nothing to dump } |