Merge branch 'develop-linux' into marchcat/slua-linux

# Conflicts:
#	indra/newview/llfeaturemanager.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/indra/newview/llpathfindingcharacterlist.cpp b/indra/newview/llpathfindingcharacterlist.cpp
index 1366ba6c6f..8e03492381 100644
--- a/indra/newview/llpathfindingcharacterlist.cpp
+++ b/indra/newview/llpathfindingcharacterlist.cpp
@@ -65,7 +65,7 @@ void LLPathfindingCharacterList::parseCharacterListData(const LLSD& pCharacterLi
             continue;
         const std::string& uuid(characterDataIter->first);
         const LLSD& characterData = characterDataIter->second;
-        LLPathfindingObjectPtr character(new LLPathfindingCharacter(uuid, characterData));
+        LLPathfindingObjectPtr character = std::make_shared<LLPathfindingCharacter>(uuid, characterData);
         objectMap.insert(std::pair<std::string, LLPathfindingObjectPtr>(uuid, character));
     }
 }