diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-02 11:27:52 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-02 11:27:52 +0100 |
commit | 63f2ddf377fa0fc6a666cdc1001289335d86258b (patch) | |
tree | ace7455bb907429aa992a593b4b0dc3704be8914 /indra/newview/llhudobject.cpp | |
parent | ae115d1a89bc425aee478bd31a66827a6f49fd8a (diff) | |
parent | 39e6447d98a36eb196f9ed6a3b06f0390f1ed084 (diff) |
merge for VWR-1852 VWR-8726 VWR-4232 VWR-22752
Diffstat (limited to 'indra/newview/llhudobject.cpp')
-rw-r--r-- | indra/newview/llhudobject.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/indra/newview/llhudobject.cpp b/indra/newview/llhudobject.cpp index 6af0ae2b6a..3e814a0773 100644 --- a/indra/newview/llhudobject.cpp +++ b/indra/newview/llhudobject.cpp @@ -305,6 +305,27 @@ void LLHUDObject::renderAllForSelect() } // static +void LLHUDObject::renderAllForTimer() +{ + LLHUDObject *hud_objp; + + hud_object_list_t::iterator object_it; + for (object_it = sHUDObjects.begin(); object_it != sHUDObjects.end(); ) + { + hud_object_list_t::iterator cur_it = object_it++; + hud_objp = (*cur_it); + if (hud_objp->getNumRefs() == 1) + { + sHUDObjects.erase(cur_it); + } + else if (hud_objp->isVisible()) + { + hud_objp->renderForTimer(); + } + } +} + +// static void LLHUDObject::sortObjects() { sHUDObjects.sort(hud_object_further_away()); |