diff options
| author | prep <prep@lindenlab.com> | 2012-06-18 12:27:46 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-06-18 12:27:46 -0400 |
| commit | 329b98528ea4fdd34baaa225e4aa46ea8ad5bfe1 (patch) | |
| tree | 1e4d8488913eec8eebbc6ab4579ad405d3124c20 /indra/newview/lllocationinputctrl.cpp | |
| parent | 583855f3e6ba45915c0031396ed90054a18c4c4d (diff) | |
| parent | 501127e4649cf6cdb8e1c31d66d8d24e20fe0631 (diff) | |
merge
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index db7371d993..0d8526d3f1 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -827,7 +827,7 @@ void LLLocationInputCtrl::refreshParcelIcons() bool allow_scripts = vpm->allowAgentScripts(agent_region, current_parcel); bool allow_damage = vpm->allowAgentDamage(agent_region, current_parcel); bool see_avs = current_parcel->getSeeAVs(); - bool pathfinding_dynamic = gAgent.getRegion()->dynamicPathfindingEnabled(); + bool pathfinding_dynamic_enabled = gAgent.getRegion()->dynamicPathfindingEnabled(); // Most icons are "block this ability" mParcelIcon[VOICE_ICON]->setVisible( !allow_voice ); @@ -836,7 +836,7 @@ void LLLocationInputCtrl::refreshParcelIcons() mParcelIcon[BUILD_ICON]->setVisible( !allow_build ); mParcelIcon[SCRIPTS_ICON]->setVisible( !allow_scripts ); mParcelIcon[DAMAGE_ICON]->setVisible( allow_damage ); - mParcelIcon[PATHFINDING_DYNAMIC_ICON]->setVisible( pathfinding_dynamic ); + mParcelIcon[PATHFINDING_DYNAMIC_ICON]->setVisible( !pathfinding_dynamic_enabled ); mDamageText->setVisible(allow_damage); mParcelIcon[SEE_AVATARS_ICON]->setVisible( !see_avs ); |