summaryrefslogtreecommitdiff
path: root/indra/newview/llpathfindingmanager.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-09-16 11:04:12 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-09-16 11:04:12 -0400
commit099e3b41668a8c951cf74ec585ed4192bab507db (patch)
tree5481b7cbb15e5674d552fb063227c1277bcdb78b /indra/newview/llpathfindingmanager.cpp
parent51bb369a39142ff5049f753099f9638ce68b95dc (diff)
parentd2c3c2f9fe197b1856e9a8ed37aeb56b77e2ff07 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llpathfindingmanager.cpp')
-rw-r--r--indra/newview/llpathfindingmanager.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index 711a869e82..cb4c07a417 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -144,8 +144,7 @@ typedef boost::shared_ptr<LinksetsResponder> LinksetsResponderPtr;
// LLPathfindingManager
//---------------------------------------------------------------------------
-LLPathfindingManager::LLPathfindingManager()
- : LLSingleton<LLPathfindingManager>(),
+LLPathfindingManager::LLPathfindingManager():
mNavMeshMap(),
mAgentStateSignal()
{