livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

meow-7.2.2
Matthew Breindel (Falcon) 2012-06-15 18:45:22 +00:00
parent 357c1f57b4 72a2538f74
commit 1ac0cd035d
7 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/lllocationinputctrl.cpp
View File

@ -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 );

10
indra/newview/llpathfindingmanager.cpp
View File

@ -285,10 +285,7 @@ LLPathfindingManager::LLPathfindingManager()
mShowNavMeshRebake(false),
mCrossingSlot()
{
if ( !mCrossingSlot.connected() )
{
mCrossingSlot = LLEnvManagerNew::getInstance()->setRegionChangeCallback(boost::bind(&LLPathfindingManager::onRegionBoundaryCrossed, this));
}
}
void LLPathfindingManager::onRegionBoundaryCrossed()
@ -616,6 +613,11 @@ LLPathfindingNavMeshPtr LLPathfindingManager::getNavMeshForRegion(LLViewerRegion
void LLPathfindingManager::requestGetAgentState()
{
if ( !mCrossingSlot.connected() )
{
mCrossingSlot = LLEnvManagerNew::getInstance()->setRegionChangeCallback(boost::bind(&LLPathfindingManager::onRegionBoundaryCrossed, this));
}
std::string agentStateURL = getAgentStateURLForCurrentRegion( getCurrentRegion() );
if ( !agentStateURL.empty() )

8
indra/newview/llpathfindingmanager.h
View File

@ -98,6 +98,7 @@ public:
void handleNavMeshRebakeError( U32 pStatus, const std::string &pReason, const std::string &pURL );
void triggerNavMeshRebuild();
void onRegionBoundaryCrossed();
void requestGetAgentState();
protected:
@ -129,16 +130,13 @@ private:
void displayNavMeshRebakePanel();
void hideNavMeshRebakePanel();
void requestGetAgentState();
void handleAgentStateResult(const LLSD &pContent );//, EAgentState pRequestedAgentState);
void handleAgentStateResult(const LLSD &pContent );
void handleAgentStateError(U32 pStatus, const std::string &pReason, const std::string &pURL);
NavMeshMap mNavMeshMap;
//prep#stinson# set this flag instead of directly showing/hiding the rebake panel
BOOL mShowNavMeshRebake;
};

2
indra/newview/llstartup.cpp
View File

@ -2169,6 +2169,8 @@ bool idle_startup()
LLIMFloater::initIMFloater();
display_startup();
LLPathfindingManager::getInstance()->requestGetAgentState();
return TRUE;
}

BIN
indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 683 B

After

Width:  |  Height:  |  Size: 384 B

2
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -5786,7 +5786,7 @@ This area has building disabled. You can't build or rez objects here.
persist="true"
type="notify">
<unique/>
Dynamic pathing is enabled.
Dynamic pathing is not available.
</notification>
<notification

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -3325,7 +3325,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
<string name="LocationCtrlGeneralIconTooltip">General Region</string>
<string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
<string name="PathfindingDynamicTooltip">Dynamic Pathfinding Enabled</string>
<string name="PathfindingDynamicTooltip">Dynamic Pathfinding is not available</string>
<!-- Strings used by the (currently Linux) auto-updater app -->
<string name="UpdaterWindowTitle">
[APP_NAME] Update