diff options
| author | James Cook <james@lindenlab.com> | 2009-11-20 14:45:51 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-20 14:45:51 -0800 |
| commit | cbbb107d1f71f8a8474abbe7e1747a4332f6aa0e (patch) | |
| tree | 15d8abf1822a31755783b2447abd5afb33a8f3ce /indra/newview/llagent.cpp | |
| parent | 3bb86f91bc345f74057debe1f8f680098895a40e (diff) | |
| parent | 67c832d94b53fb5d32ec27eebf7f57b668e899db (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; |