aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llhudeffectbeam.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2010-01-26 13:02:07 -0600
committerJacek Antonelli2010-01-26 14:25:07 -0600
commit6e1e243da8c06ddd6847576c55e134d72ef42491 (patch)
tree3cd1bfbd60d3b92323717afda3fa5a821cf4066c /linden/indra/newview/llhudeffectbeam.cpp
parentChangeLog entry: Several changes to work better on 64bit Linux. (diff)
parentSNOW-413 Potential null pointer exception in multi-slider control (diff)
downloadmeta-impy-6e1e243da8c06ddd6847576c55e134d72ef42491.zip
meta-impy-6e1e243da8c06ddd6847576c55e134d72ef42491.tar.gz
meta-impy-6e1e243da8c06ddd6847576c55e134d72ef42491.tar.bz2
meta-impy-6e1e243da8c06ddd6847576c55e134d72ef42491.tar.xz
Merged bug fixes by Mm Alder and Admiral Admiral.
Diffstat (limited to 'linden/indra/newview/llhudeffectbeam.cpp')
-rw-r--r--linden/indra/newview/llhudeffectbeam.cpp5
1 files changed, 5 insertions, 0 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()
312 } 312 }
313} 313}
314 314
315void LLHUDEffectBeam::renderForTimer()
316{
317 render();
318}
319
315void LLHUDEffectBeam::setupParticle(const S32 i) 320void LLHUDEffectBeam::setupParticle(const S32 i)
316{ 321{
317 LLVector3d start_pos_global; 322 LLVector3d start_pos_global;