diff options
| author | angela <angela@lindenlab.com> | 2009-11-20 09:55:19 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-20 09:55:19 +0800 |
| commit | d670d84147f0cac1255aae2e463d17de3a87624e (patch) | |
| tree | 059f7bd73b9fc80b4f19a166aae4cf5467794aa5 /indra/newview/llagent.cpp | |
| parent | 496ad115b102111cb394c09663d9da579f07b606 (diff) | |
| parent | 53f4bedaa57898c0b6b090ef29ad4f70a9c34ee4 (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; |