From e558f5cb0b8c0937da0f08a1af149afbc497462c Mon Sep 17 00:00:00 2001 From: prep Date: Mon, 12 Mar 2012 15:04:09 -0400 Subject: path-405: Avatar is no longer frozen when pathing window is up and when avatar crosses a region boundary the resident is informed with a message in the pathing window. --- indra/newview/llfloaterpathfindingconsole.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/llfloaterpathfindingconsole.cpp') diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp index 493b4617b5..c336a30bc9 100644 --- a/indra/newview/llfloaterpathfindingconsole.cpp +++ b/indra/newview/llfloaterpathfindingconsole.cpp @@ -873,3 +873,12 @@ U32 LLFloaterPathfindingConsole::getRenderShapeFlags() } return mShapeRenderFlags; } + +void LLFloaterPathfindingConsole::regionCrossingOccured() +{ + std::string statusText(""); + LLStyle::Params styleParams; + styleParams.color = LLUIColorTable::instance().getColor("DrYellow"); + statusText = getString("navmesh_update_needed"); + mPathfindingStatus->setText((LLStringExplicit)statusText, styleParams); +} \ No newline at end of file -- cgit v1.2.3 From 87b414c4934d0d52eef0b323245568bb1e95ec70 Mon Sep 17 00:00:00 2001 From: prep Date: Mon, 12 Mar 2012 15:24:30 -0400 Subject: path-396: rendering options are reset when pathing window is closed. --- indra/newview/llfloaterpathfindingconsole.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/llfloaterpathfindingconsole.cpp') diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp index c336a30bc9..405b089155 100644 --- a/indra/newview/llfloaterpathfindingconsole.cpp +++ b/indra/newview/llfloaterpathfindingconsole.cpp @@ -207,6 +207,13 @@ void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting) LLFloater::onClose(pIsAppQuitting); setHeartBeat( false ); setConsoleState(kConsoleStateUnknown); + //Reset all the checkboxes to default + mShowNavMeshCheckBox->set( false ); + mShowWalkablesCheckBox->set( false ); + mShowMaterialVolumesCheckBox->set( false ); + mShowStaticObstaclesCheckBox->set( false ); + mShowExclusionVolumesCheckBox->set( false ); + mShowWorldCheckBox->set( false ); } BOOL LLFloaterPathfindingConsole::handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down) -- cgit v1.2.3