7 files changed, 53 insertions, 5 deletions

diff --git a/linden/indra/newview/llhudeffectbeam.cpp b/linden/indra/newview/llhudeffectbeam.cpp
index 6cb3bef..a7c1214 100644
--- a/linden/indra/newview/llhudeffectbeam.cpp
+++ b/linden/indra/newview/llhudeffectbeam.cpp
@@ -312,6 +312,11 @@ void LLHUDEffectBeam::render()
         }
 }
 
+void LLHUDEffectBeam::renderForTimer()
+{
+        render();
+}
+
 void LLHUDEffectBeam::setupParticle(const S32 i)
 {
         LLVector3d start_pos_global;
diff --git a/linden/indra/newview/llhudeffectbeam.h b/linden/indra/newview/llhudeffectbeam.h
index 7365894..69e2b51 100644
--- a/linden/indra/newview/llhudeffectbeam.h
+++ b/linden/indra/newview/llhudeffectbeam.h
@@ -58,6 +58,7 @@ protected:
         ~LLHUDEffectBeam();
 
         /*virtual*/ void render();
+        /*virtual*/ void renderForTimer();
         /*virtual*/ void packData(LLMessageSystem *mesgsys);
         /*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum);
 private:
diff --git a/linden/indra/newview/llhudeffecttrail.cpp b/linden/indra/newview/llhudeffecttrail.cpp
index 32b52f8..08f4c78 100644
--- a/linden/indra/newview/llhudeffecttrail.cpp
+++ b/linden/indra/newview/llhudeffecttrail.cpp
@@ -287,3 +287,8 @@ void LLHUDEffectSpiral::render()
                 return;
         }
 }
+
+void LLHUDEffectSpiral::renderForTimer()
+{
+        render();
+}
diff --git a/linden/indra/newview/llhudeffecttrail.h b/linden/indra/newview/llhudeffecttrail.h
index 60836c2..033fbeb 100644
--- a/linden/indra/newview/llhudeffecttrail.h
+++ b/linden/indra/newview/llhudeffecttrail.h
@@ -68,6 +68,7 @@ protected:
         ~LLHUDEffectSpiral();
 
         /*virtual*/ void render();
+        /*virtual*/ void renderForTimer();
         /*virtual*/ void packData(LLMessageSystem *mesgsys);
         /*virtual*/ void unpackData(LLMessageSystem *mesgsys, S32 blocknum);
 private:
diff --git a/linden/indra/newview/llhudobject.cpp b/linden/indra/newview/llhudobject.cpp
index bdff492..ea6e0bf 100644
--- a/linden/indra/newview/llhudobject.cpp
+++ b/linden/indra/newview/llhudobject.cpp
@@ -308,6 +308,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());    
diff --git a/linden/indra/newview/llhudobject.h b/linden/indra/newview/llhudobject.h
index 2cd8abf..84c2f84 100644
--- a/linden/indra/newview/llhudobject.h
+++ b/linden/indra/newview/llhudobject.h
@@ -75,6 +75,7 @@ public:
         static void updateAll();
         static void renderAll();
         static void renderAllForSelect();
+        static void renderAllForTimer();
 
         static void cleanupHUDObjects();
 
@@ -106,6 +107,7 @@ protected:
 
         virtual void render() = 0;
         virtual void renderForSelect() {};
+        virtual void renderForTimer() {};
         
 protected:
         U8                              mType;
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 4ea9e41..d3ee8b6 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -2724,12 +2724,20 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
 
         LLVertexBuffer::unbind();
         
-        if (!LLPipeline::sReflectionRender && !LLPipeline::sRenderDeferred && gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
+        if (!LLPipeline::sReflectionRender && !LLPipeline::sRenderDeferred)
         {
-                // Render debugging beacons.
-                gObjectList.renderObjectBeacons();
-                LLHUDObject::renderAll();
-                gObjectList.resetObjectBeacons();
+                if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
+                {
+                        // Render debugging beacons.
+                        gObjectList.renderObjectBeacons();
+                        LLHUDObject::renderAll();
+                        gObjectList.resetObjectBeacons();
+                }
+                else
+                {
+                        // Make sure particle effects disappear
+                        LLHUDObject::renderAllForTimer();
+                }
         }
 
         LLAppViewer::instance()->pingMainloopTimeout("Pipeline:RenderGeomEnd");
@@ -2954,6 +2962,11 @@ void LLPipeline::renderGeomPostDeferred(LLCamera& camera)
                 LLHUDObject::renderAll();
                 gObjectList.resetObjectBeacons();
         }
+        else
+        {
+                // Make sure particle effects disappear
+                LLHUDObject::renderAllForTimer();
+        }
 
         if (occlude)
         {