From 0ac1f982b6ab527d709a5a2a526edfb40603d1cd Mon Sep 17 00:00:00 2001
From: prep <none@none>
Date: Tue, 24 Jan 2012 16:12:20 -0500
Subject: merge fix

---
 indra/newview/llfloaterpathfindingconsole.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

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 );				
-- 
cgit v1.2.3