diff options
author | Todd Stinson <stinson@lindenlab.com> | 2012-06-14 17:09:14 -0700 |
---|---|---|
committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-14 17:09:14 -0700 |
commit | 8a1c557cbffcc4608f0c3b2c69dedef69bb7f3f3 (patch) | |
tree | 5a272b296d9bc5c1d7c1b5081505c585d2a88861 /indra/newview | |
parent | f6153ab73508ad972827950e0276dfd2a8e79bf1 (diff) |
Updating the slurl icon with Leo's design and toggling the behavior to show on PF disabled regions.
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 4 | ||||
-rw-r--r-- | indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png | bin | 683 -> 384 bytes |
2 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 ); diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png b/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png Binary files differindex 2c485aef0d..0622141848 100644 --- a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png +++ b/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png |