diff options
author | Patrick Sapinski | 2011-02-28 08:22:41 -0500 |
---|---|---|
committer | McCabe Maxsted | 2011-03-10 13:19:25 -0700 |
commit | af6a992d43bb45857fb7928f5f3860ebacc432c4 (patch) | |
tree | 4c6e92f8c23d81b8b81d299aa3f93dcb044ea70f /linden | |
parent | Merge remote-tracking branch 'armin/weekly' into weekly (diff) | |
download | meta-impy-af6a992d43bb45857fb7928f5f3860ebacc432c4.zip meta-impy-af6a992d43bb45857fb7928f5f3860ebacc432c4.tar.gz meta-impy-af6a992d43bb45857fb7928f5f3860ebacc432c4.tar.bz2 meta-impy-af6a992d43bb45857fb7928f5f3860ebacc432c4.tar.xz |
fix for AO from Emerald
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/floaterao.cpp | 11 | ||||
-rw-r--r-- | linden/indra/newview/floaterao.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/linden/indra/newview/floaterao.cpp b/linden/indra/newview/floaterao.cpp index cfad0fb..d880722 100644 --- a/linden/indra/newview/floaterao.cpp +++ b/linden/indra/newview/floaterao.cpp | |||
@@ -601,6 +601,8 @@ void LLFloaterAO::updateLayout(LLFloaterAO* floater) | |||
601 | } | 601 | } |
602 | } | 602 | } |
603 | 603 | ||
604 | BOOL LLFloaterAO::fullfetch = FALSE; | ||
605 | |||
604 | void LLFloaterAO::init() | 606 | void LLFloaterAO::init() |
605 | { | 607 | { |
606 | mAOStands.clear(); | 608 | mAOStands.clear(); |
@@ -695,6 +697,15 @@ void LLFloaterAO::init() | |||
695 | success = TRUE; | 697 | success = TRUE; |
696 | } | 698 | } |
697 | } | 699 | } |
700 | }else | ||
701 | { | ||
702 | //static BOOL startedfetch = FALSE; | ||
703 | if(fullfetch == FALSE) | ||
704 | { | ||
705 | fullfetch = TRUE; | ||
706 | //no choice, can't move the AO till we find it, should only have to happen once | ||
707 | gInventory.startBackgroundFetch(); | ||
708 | } | ||
698 | } | 709 | } |
699 | } | 710 | } |
700 | } | 711 | } |
diff --git a/linden/indra/newview/floaterao.h b/linden/indra/newview/floaterao.h index cf8ee22..ed60140 100644 --- a/linden/indra/newview/floaterao.h +++ b/linden/indra/newview/floaterao.h | |||
@@ -66,6 +66,7 @@ public: | |||
66 | 66 | ||
67 | static void show(void*); | 67 | static void show(void*); |
68 | static void init(); | 68 | static void init(); |
69 | static BOOL fullfetch; | ||
69 | 70 | ||
70 | static void onClickToggleAO(LLUICtrl *, void*); | 71 | static void onClickToggleAO(LLUICtrl *, void*); |
71 | static void onClickToggleSits(LLUICtrl *, void*); | 72 | static void onClickToggleSits(LLUICtrl *, void*); |