diff options
| author | prep <none@none> | 2012-01-24 16:12:20 -0500 |
|---|---|---|
| committer | prep <none@none> | 2012-01-24 16:12:20 -0500 |
| commit | 0ac1f982b6ab527d709a5a2a526edfb40603d1cd (patch) | |
| tree | 7b5469654f19d943096613bded626978c07eff3a | |
| parent | d4c0c127b62499b72745de7f9df135ec0286cc13 (diff) | |
merge fix
| -rw-r--r-- | indra/newview/llfloaterpathfindingconsole.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp index 8556127051..d51f427c4e 100644 --- a/indra/newview/llfloaterpathfindingconsole.cpp +++ b/indra/newview/llfloaterpathfindingconsole.cpp @@ -390,7 +390,8 @@ void LLFloaterPathfindingConsole::onOpen(const LLSD& pKey) if ( !url.empty() )
{
- llinfos<<"Region has required caps of type ["<<capability<<"]"<<llendl;
+ std::string str = getString("navmesh_fetch_inprogress");
+ mPathfindingStatus->setText((LLStringExplicit)str);
LLNavMeshStation::getInstance()->setNavMeshDownloadURL( url );
int dir = shift[i];
LLNavMeshStation::getInstance()->downloadNavMeshSrc( mNavMeshDownloadObserver[mCurrentMDO].getObserverHandle(), dir );
|