diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 631e45d0ec..331ae02223 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13494,5 +13494,17 @@
       <key>Value</key>
 	  <integer>6</integer>
     </map>
+	<key>EnableVBOForNavMeshVisualization</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable the use of VBOs for navmesh visualization.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+	  <integer>0</integer>
+    </map>
+
 </map>
 </llsd>
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index c54f6a1ffe..5db052e448 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -397,7 +397,7 @@ void LLFloaterPathfindingConsole::setHasNavMeshReceived()
 	--mNavMeshCnt;
 	if ( mNavMeshCnt == 0 )
 	{
-		LLPathingLib::getInstance()->stitchNavMeshes();
+		LLPathingLib::getInstance()->stitchNavMeshes( gSavedSettings.getBOOL("EnableVBOForNavMeshVisualization") );
 	}
 }