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

PATH-714: Removing the DEPRECATED_UNVERSIONED_NAVMESH as the viewer no longer has to support the Premium Wilderness regions on the old server code.

meow-7.2.2
Todd Stinson 2012-06-11 17:03:15 -07:00
parent b912c27bf4
commit e738e704b8
6 changed files with 0 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
indra/newview/llfloaterpathfindingconsole.cpp
View File

@ -847,39 +847,6 @@ std::string LLFloaterPathfindingConsole::getSimulatorStatusText() const
{
std::string simulatorStatusText("");
#ifdef DEPRECATED_UNVERSIONED_NAVMESH
if (LLPathfindingManager::getInstance()->isPathfindingNavMeshVersioningEnabledForCurrentRegionXXX())
{
switch (mNavMeshZone.getNavMeshZoneStatus())
{
case LLPathfindingNavMeshZone::kNavMeshZonePending :
simulatorStatusText = getString("navmesh_simulator_status_pending");
break;
case LLPathfindingNavMeshZone::kNavMeshZoneBuilding :
simulatorStatusText = getString("navmesh_simulator_status_building");
break;
case LLPathfindingNavMeshZone::kNavMeshZoneSomePending :
simulatorStatusText = getString("navmesh_simulator_status_some_pending");
break;
case LLPathfindingNavMeshZone::kNavMeshZoneSomeBuilding :
simulatorStatusText = getString("navmesh_simulator_status_some_building");
break;
case LLPathfindingNavMeshZone::kNavMeshZonePendingAndBuilding :
simulatorStatusText = getString("navmesh_simulator_status_pending_and_building");
break;
case LLPathfindingNavMeshZone::kNavMeshZoneComplete :
simulatorStatusText = getString("navmesh_simulator_status_complete");
break;
default :
simulatorStatusText = getString("navmesh_simulator_status_unknown");
break;
}
}
else
{
simulatorStatusText = getString("navmesh_simulator_status_region_not_enabled");
}
#else // DEPRECATED_UNVERSIONED_NAVMESH
switch (mNavMeshZone.getNavMeshZoneStatus())
{
case LLPathfindingNavMeshZone::kNavMeshZonePending :
@ -904,7 +871,6 @@ std::string LLFloaterPathfindingConsole::getSimulatorStatusText() const
simulatorStatusText = getString("navmesh_simulator_status_unknown");
break;
}
#endif // DEPRECATED_UNVERSIONED_NAVMESH
return simulatorStatusText;
}

23
indra/newview/llpathfindingmanager.cpp
View File

@ -293,14 +293,6 @@ bool LLPathfindingManager::isPathfindingEnabledForRegion(LLViewerRegion *pRegion
return !retrieveNavMeshURL.empty();
}
#ifdef DEPRECATED_UNVERSIONED_NAVMESH
bool LLPathfindingManager::isPathfindingNavMeshVersioningEnabledForCurrentRegionXXX() const
{
std::string navMeshStatusURL = getNavMeshStatusURLForRegion(getCurrentRegion());
return !navMeshStatusURL.empty();
}
#endif // DEPRECATED_UNVERSIONED_NAVMESH
bool LLPathfindingManager::isPathfindingDebugEnabled() const
{
return (LLPathingLib::getInstance() != NULL);
@ -338,25 +330,10 @@ void LLPathfindingManager::requestGetNavMeshForRegion(LLViewerRegion *pRegion)
else
{
std::string navMeshStatusURL = getNavMeshStatusURLForRegion(pRegion);
#ifdef DEPRECATED_UNVERSIONED_NAVMESH
if (navMeshStatusURL.empty())
{
LLPathfindingNavMeshStatus navMeshStatus = navMeshPtr->getNavMeshStatusXXX();
navMeshStatus.incrementNavMeshVersionXXX();
sendRequestGetNavMeshForRegion(navMeshPtr, pRegion, navMeshStatus);
}
else
{
navMeshPtr->handleNavMeshCheckVersion();
LLHTTPClient::ResponderPtr navMeshStatusResponder = new NavMeshStatusResponder(navMeshStatusURL, pRegion);
LLHTTPClient::get(navMeshStatusURL, navMeshStatusResponder);
}
#else // DEPRECATED_UNVERSIONED_NAVMESH
llassert(!navMeshStatusURL.empty());
navMeshPtr->handleNavMeshCheckVersion();
LLHTTPClient::ResponderPtr navMeshStatusResponder = new NavMeshStatusResponder(navMeshStatusURL, pRegion);
LLHTTPClient::get(navMeshStatusURL, navMeshStatusResponder);
#endif // DEPRECATED_UNVERSIONED_NAVMESH
}
}

3
indra/newview/llpathfindingmanager.h
View File

@ -78,9 +78,6 @@ public:
bool isPathfindingEnabledForCurrentRegion() const;
bool isPathfindingEnabledForRegion(LLViewerRegion *pRegion) const;
#ifdef DEPRECATED_UNVERSIONED_NAVMESH
bool isPathfindingNavMeshVersioningEnabledForCurrentRegionXXX() const;
#endif // DEPRECATED_UNVERSIONED_NAVMESH
bool isPathfindingDebugEnabled() const;

4
indra/newview/llpathfindingnavmesh.h
View File

@ -66,10 +66,6 @@ public:
navmesh_slot_t registerNavMeshListener(navmesh_callback_t pNavMeshCallback);
#ifdef DEPRECATED_UNVERSIONED_NAVMESH
const LLPathfindingNavMeshStatus &getNavMeshStatusXXX() const {return mNavMeshStatus;};
#endif // DEPRECATED_UNVERSIONED_NAVMESH
bool hasNavMeshVersion(const LLPathfindingNavMeshStatus &pNavMeshStatus) const;
void handleNavMeshWaitForRegionLoad();

7
indra/newview/llpathfindingnavmeshstatus.h
View File

@ -32,9 +32,6 @@
#include <string>
// XXX stinson 03/12/2012 : This definition is in place to support an older version of the pathfinding simulator that does not have versioned information
#define DEPRECATED_UNVERSIONED_NAVMESH
class LLSD;
class LLPathfindingNavMeshStatus
@ -57,10 +54,6 @@ public:
LLPathfindingNavMeshStatus &operator =(const LLPathfindingNavMeshStatus &pOther);
#ifdef DEPRECATED_UNVERSIONED_NAVMESH
void incrementNavMeshVersionXXX() {++mVersion;};
#endif // DEPRECATED_UNVERSIONED_NAVMESH
bool isValid() const {return mIsValid;};
const LLUUID &getRegionUUID() const {return mRegionUUID;};
U32 getVersion() const {return mVersion;};

1
indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
View File

@ -21,7 +21,6 @@
<floater.string name="navmesh_viewer_status_has_navmesh">Latest navmesh has been downloaded.</floater.string>
<floater.string name="navmesh_viewer_status_error">Unable to download navmesh successfully.</floater.string>
<floater.string name="navmesh_simulator_status_unknown"></floater.string>
<floater.string name="navmesh_simulator_status_region_not_enabled">This region does not expose the navmesh status.</floater.string>
<floater.string name="navmesh_simulator_status_pending">Navmesh has pending changes.</floater.string>
<floater.string name="navmesh_simulator_status_building">Navmesh is building.</floater.string>
<floater.string name="navmesh_simulator_status_some_pending">Some navmesh regions have pending changes.</floater.string>