diff options
| author | James Cook <james@lindenlab.com> | 2009-11-20 09:46:23 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-20 09:46:23 -0800 |
| commit | fc04d5bbb8b51b9ca39d1a3a1de0991de09cdb58 (patch) | |
| tree | 0cc35255caa59f0f616ccb328bd42824505bfffc /indra/newview/llagent.cpp | |
| parent | ba3f7965e35e4eb0d7fcecc7267ec3af5f2d8d87 (diff) | |
| parent | 644ee3f5ded17513e09de8c62a2bafe69ceb03d6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index fb2ecb3bed..4dd569e2fa 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -2810,7 +2810,11 @@ void LLAgent::endAnimationUpdateUI() LLFloaterReg::restoreVisibleInstances(); #else // Use this for now LLFloaterView::skip_list_t skip_list; - skip_list.insert(LLFloaterReg::findInstance("mini_map")); + if (LLFloaterReg::findInstance("mini_map")) + { + skip_list.insert(LLFloaterReg::findInstance("mini_map")); + } + gFloaterView->popVisibleAll(skip_list); #endif mViewsPushed = FALSE; |