diff options
| author | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-20 17:18:46 -0800 |
|---|---|---|
| committer | Ramzi Linden <ramzi@lindenlab.com> | 2009-11-20 17:18:46 -0800 |
| commit | 3ea3f52aedd1efc568b01c8f618c5bbe805f61db (patch) | |
| tree | 11790cd07a5ebc39b16c409956d7bf900424f7f1 /indra/newview/llagent.cpp | |
| parent | 1d5775a23fbcf00ad3e459393a7cf1d80a762bf8 (diff) | |
| parent | 1d9d099baae1b502f4fae02238330c06bf49adb2 (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; |