summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorprep <none@none>2012-06-13 11:08:07 -0400
committerprep <none@none>2012-06-13 11:08:07 -0400
commitd7b9af3ab398aedde1229e081c2b245c20a3c6d5 (patch)
tree6badeaf26f5494f258cfd624bdf5b2692fd4429d /indra
parentde1e1db9600a03ab5b0dc3f04a5bdcee30632f05 (diff)
path-724: xml navmesh rebake button
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llpathfindingmanager.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml21
2 files changed, 22 insertions, 1 deletions
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 6d0629698a..278269b2fa 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -318,7 +318,7 @@ void LLPathfindingManager::requestGetNavMeshForRegion(LLViewerRegion *pRegion)
LLPathfindingNavMeshPtr navMeshPtr = getNavMeshForRegion(pRegion);
//prep#s#test
LLView* rootp = LLUI::getRootView();
- LLPanel* panel_nmr_container = rootp->getChild<LLPanel>("navmesh_rebake_container");
+ LLPanel* panel_nmr_container = rootp->getChild<LLPanel>("navmesh_rebake_container");
LLPanelNavMeshRebake* panel_namesh_rebake = LLPanelNavMeshRebake::getInstance();
panel_nmr_container->addChild( panel_namesh_rebake );
panel_nmr_container->setVisible( TRUE );
diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
new file mode 100644
index 0000000000..302b7afe49
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="25"
+ layout="topleft"
+ name="panel_navmesh_rebake"
+ mouse_opaque="false"
+ visible="true"
+ width="133">
+ <button
+ follows="left|bottom"
+ height="19"
+ label="NavMeshRebake"
+ layout="topleft"
+ left="10"
+ name="navmesh_btn"
+ tool_tip="Click here to rebake."
+ top="2"
+ visible="false"
+ width="113" />
+</panel>
+