diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-24 14:39:39 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2009-11-24 14:39:39 -0500 |
| commit | c812c616ea0ba6531b3fe7f75efc815081cd0c2e (patch) | |
| tree | 2d966b5ba9fae58a3369055fadd6192b417c7f46 /indra/newview/llagent.cpp | |
| parent | fc6cfc27bec61ac1f66c1304cc7b54f19157584e (diff) | |
| parent | a22bb00530bb779d8e5bb40b68e55767604d88dc (diff) | |
merge
--HG--
branch : avatar-pipeline
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 9b3e97e8d8..e287958697 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -2814,7 +2814,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; |