Stubbing out functionality for catching the rebuild and refresh navmesh button clicks.

3 files changed, 19 insertions, 5 deletions

diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp
index c6613e4035..cd3794f5a9 100644
--- a/indra/newview/llfloaterpathfindingconsole.cpp
+++ b/indra/newview/llfloaterpathfindingconsole.cpp
@@ -47,6 +47,8 @@
 BOOL LLFloaterPathfindingConsole::postBuild()

 {

 	childSetAction("view_and_edit_linksets", boost::bind(&LLFloaterPathfindingConsole::onViewEditLinksetClicked, this));

+	childSetAction("rebuild_navmesh", boost::bind(&LLFloaterPathfindingConsole::onRebuildNavmeshClicked, this));

+	childSetAction("refresh_navmesh", boost::bind(&LLFloaterPathfindingConsole::onRefreshNavmeshClicked, this));

 

 	mShowNavmeshCheckBox = findChild<LLCheckBoxCtrl>("show_navmesh_overlay");

 	llassert(mShowNavmeshCheckBox != NULL);

@@ -273,6 +275,16 @@ void LLFloaterPathfindingConsole::onViewEditLinksetClicked()
 	LLFloaterPathfindingLinksets::openLinksetsEditor();

 }

 

+void LLFloaterPathfindingConsole::onRebuildNavmeshClicked()

+{

+	llwarns << "functionality has not yet been implemented to handle rebuilding of the navmesh" << llendl;

+}

+

+void LLFloaterPathfindingConsole::onRefreshNavmeshClicked()

+{

+	llwarns << "functionality has not yet been implemented to handle refreshing of the navmesh" << llendl;

+}

+

 LLFloaterPathfindingConsole::ERegionOverlayDisplay LLFloaterPathfindingConsole::getRegionOverlayDisplay() const

 {

 	ERegionOverlayDisplay regionOverlayDisplay;

diff --git a/indra/newview/llfloaterpathfindingconsole.h b/indra/newview/llfloaterpathfindingconsole.h
index a0a1500d94..e0dd796ef6 100644
--- a/indra/newview/llfloaterpathfindingconsole.h
+++ b/indra/newview/llfloaterpathfindingconsole.h
@@ -84,6 +84,8 @@ private:
 	void onCharacterWidthSet();

 	void onCharacterTypeSwitch();

 	void onViewEditLinksetClicked();

+	void onRebuildNavmeshClicked();

+	void onRefreshNavmeshClicked();

 

 	ERegionOverlayDisplay getRegionOverlayDisplay() const;

 	EPathSelectionState   getPathSelectionState() const;

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 88905dd094..72d32b077b 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -97,7 +97,7 @@
       follows="top|left"
       height="203"
       layout="topleft"
-      name="horiz_separator"
+      name="horiz_separator_1"
       top="15"
       left="228"
       width="0"/>
@@ -254,7 +254,7 @@ to see the path between them.
       follows="top|left"
       height="203"
       layout="topleft"
-      name="horiz_separator"
+      name="horiz_separator_2"
       top="15"
       left="456"
       width="0"/>
@@ -299,7 +299,7 @@ to objects or terrain:
       height="22"
       label="Rebuild navmesh"
       layout="topleft"
-      name="linksets"
+      name="rebuild_navmesh"
       top_pad="14"
       width="149"/>
   <text
@@ -322,7 +322,7 @@ of the mesh:
       height="21"
       label="Refresh"
       layout="topleft"
-      name="refresh"
+      name="refresh_navmesh"
       top_pad="9"
       width="95"/>
   <view_border
@@ -330,7 +330,7 @@ of the mesh:
       follows="top|left"
       height="203"
       layout="topleft"
-      name="horiz_separator"
+      name="horiz_separator_3"
       top="15"
       left="667"
       width="0"/>