summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorprep <none@none>2012-01-24 16:12:20 -0500
committerprep <none@none>2012-01-24 16:12:20 -0500
commit0ac1f982b6ab527d709a5a2a526edfb40603d1cd (patch)
tree7b5469654f19d943096613bded626978c07eff3a /indra/newview
parentd4c0c127b62499b72745de7f9df135ec0286cc13 (diff)
merge fix
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterpathfindingconsole.cpp3
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 );