diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-23 15:53:49 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-23 15:53:49 +0000 |
| commit | a434e32097ca59c19a7c38aeae6b1991272569df (patch) | |
| tree | 34237f1926aee21a80f977e5b363a7c0a8592b21 /indra/newview/llagent.cpp | |
| parent | 21723e85677c69c4f78946d971bbf0e0c9cd37e5 (diff) | |
| parent | 1b07c1d7fb5b6d3ce15083bc3dbb65a3f0ac8006 (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; |