From 8b8f2fedbd733bad027f53cf2d6cc172c1d4b6d9 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Mon, 18 Jun 2012 17:55:27 -0700 Subject: Renaming the dynamic pathfinding icons to be better represent pathfinding disabled. --- indra/newview/lllocationinputctrl.cpp | 22 ++++++++++----------- indra/newview/lllocationinputctrl.h | 18 ++++++++--------- .../textures/icons/Pathfinding_Disabled.png | Bin 0 -> 384 bytes .../default/textures/icons/Pathfinding_Dynamic.png | Bin 384 -> 0 bytes indra/newview/skins/default/textures/textures.xml | 2 +- .../newview/skins/default/xui/en/notifications.xml | 4 ++-- indra/newview/skins/default/xui/en/strings.xml | 2 +- .../default/xui/en/widgets/location_input.xml | 6 +++--- 8 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png delete mode 100644 indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png (limited to 'indra') diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index 0d8526d3f1..0f299683a5 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -192,7 +192,7 @@ LLLocationInputCtrl::Params::Params() damage_text("damage_text"), see_avatars_icon("see_avatars_icon"), maturity_help_topic("maturity_help_topic"), - pathfinding_dynamic_icon("pathfinding_dynamic_icon") + pathfinding_disabled_icon("pathfinding_disabled_icon") { } @@ -338,12 +338,12 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p) mParcelIcon[DAMAGE_ICON]->setMouseDownCallback(boost::bind(&LLLocationInputCtrl::onParcelIconClick, this, DAMAGE_ICON)); addChild(mParcelIcon[DAMAGE_ICON]); - LLIconCtrl::Params pathfinding_dynamic_icon = p.pathfinding_dynamic_icon; - pathfinding_dynamic_icon.tool_tip = LLTrans::getString("PathfindingDynamicTooltip"); - pathfinding_dynamic_icon.mouse_opaque = true; - mParcelIcon[PATHFINDING_DYNAMIC_ICON] = LLUICtrlFactory::create(pathfinding_dynamic_icon); - mParcelIcon[PATHFINDING_DYNAMIC_ICON]->setMouseDownCallback(boost::bind(&LLLocationInputCtrl::onParcelIconClick, this, PATHFINDING_DYNAMIC_ICON)); - addChild(mParcelIcon[PATHFINDING_DYNAMIC_ICON]); + LLIconCtrl::Params pathfinding_disabled_icon = p.pathfinding_disabled_icon; + pathfinding_disabled_icon.tool_tip = LLTrans::getString("LocationCtrlPathfindingDisabledTooltip"); + pathfinding_disabled_icon.mouse_opaque = true; + mParcelIcon[PATHFINDING_DISABLED_ICON] = LLUICtrlFactory::create(pathfinding_disabled_icon); + mParcelIcon[PATHFINDING_DISABLED_ICON]->setMouseDownCallback(boost::bind(&LLLocationInputCtrl::onParcelIconClick, this, PATHFINDING_DISABLED_ICON)); + addChild(mParcelIcon[PATHFINDING_DISABLED_ICON]); LLTextBox::Params damage_text = p.damage_text; damage_text.tool_tip = LLTrans::getString("LocationCtrlDamageTooltip"); @@ -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_enabled = gAgent.getRegion()->dynamicPathfindingEnabled(); + bool pathfinding_dynamic_enabled = agent_region->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_enabled ); + mParcelIcon[PATHFINDING_DISABLED_ICON]->setVisible( !pathfinding_dynamic_enabled ); mDamageText->setVisible(allow_damage); mParcelIcon[SEE_AVATARS_ICON]->setVisible( !see_avs ); @@ -1176,8 +1176,8 @@ void LLLocationInputCtrl::onParcelIconClick(EParcelIcon icon) case BUILD_ICON: LLNotificationsUtil::add("NoBuild"); break; - case PATHFINDING_DYNAMIC_ICON: - LLNotificationsUtil::add("PathfindingDynamic"); + case PATHFINDING_DISABLED_ICON: + LLNotificationsUtil::add("DynamicPathfindingDisabled"); break; case SCRIPTS_ICON: { diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h index e219d4ac5d..14650c57b5 100644 --- a/indra/newview/lllocationinputctrl.h +++ b/indra/newview/lllocationinputctrl.h @@ -79,7 +79,7 @@ public: scripts_icon, damage_icon, see_avatars_icon, - pathfinding_dynamic_icon; + pathfinding_disabled_icon; Optional damage_text; Params(); }; @@ -111,14 +111,14 @@ private: enum EParcelIcon { VOICE_ICON = 0, - FLY_ICON, // 1 - PUSH_ICON, // 2 - BUILD_ICON, // 3 - SCRIPTS_ICON, // 4 - DAMAGE_ICON, // 5 - SEE_AVATARS_ICON, // 6 - PATHFINDING_DYNAMIC_ICON,// 7 - ICON_COUNT // 8 total + FLY_ICON, // 1 + PUSH_ICON, // 2 + BUILD_ICON, // 3 + SCRIPTS_ICON, // 4 + DAMAGE_ICON, // 5 + SEE_AVATARS_ICON, // 6 + PATHFINDING_DISABLED_ICON,// 7 + ICON_COUNT // 8 total }; friend class LLUICtrlFactory; diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png new file mode 100644 index 0000000000..0622141848 Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png differ diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png b/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png deleted file mode 100644 index 0622141848..0000000000 Binary files a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png and /dev/null differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 0426fa9977..8bdec15f1f 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -432,7 +432,7 @@ with the same filename but different name - + diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ac36736a51..c523add73e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5782,11 +5782,11 @@ This area has building disabled. You can't build or rez objects here. - Dynamic pathing is not available. + Dynamic pathfinding is not enabled on this region. Moderate Region General Region Avatars visible and chat allowed outside of this parcel - Dynamic Pathfinding is not available + Dynamic pathfinding is not disabled on this region [APP_NAME] Update diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index a9cb5f83ed..01dc0f200b 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -112,14 +112,14 @@ follows="right|top" image_name="Parcel_Health_Dark" /> -