diff options
author | McCabe Maxsted | 2009-06-09 09:41:04 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-09 09:41:04 -0700 |
commit | e5dbb8e4dc05e664102362685ddca94f37cdf575 (patch) | |
tree | 93e695263553adadc423cf7e7d2e4b046adb8a7a /linden/indra/newview/llagent.cpp | |
parent | Fixed the Resident Chooser showing hair instead of calling cards (diff) | |
download | meta-impy-e5dbb8e4dc05e664102362685ddca94f37cdf575.zip meta-impy-e5dbb8e4dc05e664102362685ddca94f37cdf575.tar.gz meta-impy-e5dbb8e4dc05e664102362685ddca94f37cdf575.tar.bz2 meta-impy-e5dbb8e4dc05e664102362685ddca94f37cdf575.tar.xz |
Backported 1.23's minimap conversion to XUI
Diffstat (limited to 'linden/indra/newview/llagent.cpp')
-rw-r--r-- | linden/indra/newview/llagent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp index 89ba09c..5f0a875 100644 --- a/linden/indra/newview/llagent.cpp +++ b/linden/indra/newview/llagent.cpp | |||
@@ -2816,7 +2816,7 @@ U8 LLAgent::getRenderState() | |||
2816 | static const LLFloaterView::skip_list_t& get_skip_list() | 2816 | static const LLFloaterView::skip_list_t& get_skip_list() |
2817 | { | 2817 | { |
2818 | static LLFloaterView::skip_list_t skip_list; | 2818 | static LLFloaterView::skip_list_t skip_list; |
2819 | skip_list.insert(gFloaterMap); | 2819 | skip_list.insert(LLFloaterMap::getInstance()); |
2820 | return skip_list; | 2820 | return skip_list; |
2821 | } | 2821 | } |
2822 | 2822 | ||
@@ -2894,7 +2894,7 @@ void LLAgent::endAnimationUpdateUI() | |||
2894 | // let the mini-map go visible again. JC | 2894 | // let the mini-map go visible again. JC |
2895 | if (!LLAppViewer::instance()->quitRequested()) | 2895 | if (!LLAppViewer::instance()->quitRequested()) |
2896 | { | 2896 | { |
2897 | gFloaterMap->popVisible(); | 2897 | LLFloaterMap::getInstance()->popVisible(); |
2898 | } | 2898 | } |
2899 | 2899 | ||
2900 | if( gMorphView ) | 2900 | if( gMorphView ) |
@@ -2991,7 +2991,7 @@ void LLAgent::endAnimationUpdateUI() | |||
2991 | { | 2991 | { |
2992 | LLToolMgr::getInstance()->setCurrentToolset(gFaceEditToolset); | 2992 | LLToolMgr::getInstance()->setCurrentToolset(gFaceEditToolset); |
2993 | 2993 | ||
2994 | gFloaterMap->pushVisible(FALSE); | 2994 | LLFloaterMap::getInstance()->pushVisible(FALSE); |
2995 | /* | 2995 | /* |
2996 | LLView *view; | 2996 | LLView *view; |
2997 | for (view = gFloaterView->getFirstChild(); view; view = gFloaterView->getNextChild()) | 2997 | for (view = gFloaterView->getFirstChild(); view; view = gFloaterView->getNextChild()) |