diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-24 08:08:01 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-24 08:08:01 +0100 |
commit | 1fb50635903d4bb007899154ff1e257281c24fd8 (patch) | |
tree | 401e7093777059695f07567541651e40cd1f814d /indra/newview/llfloateravatarpicker.cpp | |
parent | 88d562e8cb38c6bc9e614d5e6f1ccb6b294d4c1f (diff) | |
parent | 5e5a895b766dedde50aa137cf58f388e9acfe56c (diff) |
merge from viewer-public
Diffstat (limited to 'indra/newview/llfloateravatarpicker.cpp')
-rw-r--r-- | indra/newview/llfloateravatarpicker.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index d1e99fbd61..b40c19c2c6 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -314,6 +314,18 @@ void LLFloaterAvatarPicker::populateFriend() void LLFloaterAvatarPicker::draw() { + // sometimes it is hard to determine when Select/Ok button should be disabled (see LLAvatarActions::shareWithAvatars). + // lets check this via mOkButtonValidateSignal callback periodically. + static LLFrameTimer timer; + if (timer.hasExpired()) + { + timer.setTimerExpirySec(0.33f); // three times per second should be enough. + + // simulate list changes. + onList(); + timer.start(); + } + LLFloater::draw(); if (!mNearMeListComplete && childGetVisibleTab("ResidentChooserTabs") == getChild<LLPanel>("NearMePanel")) { |