diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-04-04 16:47:36 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-04-04 16:47:36 -0600 |
| commit | 164273afbb8131c5961266b7cb2c1e1d7973ea0b (patch) | |
| tree | 9454e482e6646251e94c64f5e334363c6750a79f | |
| parent | 7a33d88886d9f9d83d3d12c95bb41e0093159d58 (diff) | |
fix some warnings caused by scenen loading monitoring when quit viewer.
| -rw-r--r-- | indra/newview/llscenemonitor.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llscenemonitor.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llscenemonitor.cpp b/indra/newview/llscenemonitor.cpp index afb03ff268..3a2171a014 100644 --- a/indra/newview/llscenemonitor.cpp +++ b/indra/newview/llscenemonitor.cpp @@ -65,6 +65,7 @@ LLSceneMonitor::LLSceneMonitor() : mHasNewDiff(FALSE), mHasNewQueryResult(FALSE), mDebugViewerVisible(FALSE), + mQuitting(FALSE), mQueryObject(0), mSamplingTime(1.0f), mDiffPixelRatio(0.5f) @@ -78,6 +79,7 @@ LLSceneMonitor::LLSceneMonitor() : LLSceneMonitor::~LLSceneMonitor() { + mQuitting = TRUE; destroyClass(); } @@ -287,6 +289,11 @@ void LLSceneMonitor::unfreezeScene() //thaw all avatars mAvatarPauseHandles.clear(); + if(mQuitting) + { + return; //we are quitting viewer. + } + // thaw everything else gSavedSettings.setBOOL("FreezeTime", FALSE); diff --git a/indra/newview/llscenemonitor.h b/indra/newview/llscenemonitor.h index b2bc4763cf..c897b237b6 100644 --- a/indra/newview/llscenemonitor.h +++ b/indra/newview/llscenemonitor.h @@ -81,6 +81,7 @@ private: BOOL mHasNewDiff; BOOL mHasNewQueryResult; BOOL mDebugViewerVisible; + BOOL mQuitting; LLRenderTarget* mFrames[2]; LLRenderTarget* mDiff; |