summaryrefslogtreecommitdiff
path: root/indra/newview/llstatusbar.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-03-30 18:19:56 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-03-30 18:19:56 +0300
commit3e23c04c9b633f947faf8c7c11ed73ad78de8d3c (patch)
treea65e8b51b8622750038e93799274539329c66343 /indra/newview/llstatusbar.cpp
parentc73dcb079991bad12458386274cec409013ad76b (diff)
parente1517318c58d6796b5566d5cf96c02474fd7376e (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
-rw-r--r--indra/newview/llstatusbar.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index e7dc1f56ce..b660a2b8ea 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -447,11 +447,9 @@ void LLStatusBar::setHealth(S32 health)
{
if (mHealth > (health + gSavedSettings.getF32("UISndHealthReductionThreshold")))
{
- LLVOAvatar *me;
-
- if ((me = gAgent.getAvatarObject()))
+ if (isAgentAvatarValid())
{
- if (me->getSex() == SEX_FEMALE)
+ if (gAgentAvatarp->getSex() == SEX_FEMALE)
{
make_ui_sound("UISndHealthReductionF");
}