merge changes for 4.1.2-release

1 files changed, 5 insertions, 2 deletions

diff --git a/indra/newview/llpathfindinglinksetlist.cpp b/indra/newview/llpathfindinglinksetlist.cpp
index b886e46765..eb7b95552e 100644
--- a/indra/newview/llpathfindinglinksetlist.cpp
+++ b/indra/newview/llpathfindinglinksetlist.cpp
@@ -204,7 +204,10 @@ void LLPathfindingLinksetList::parseLinksetListData(const LLSD& pLinksetListData
 	{
 		const std::string& uuid(linksetDataIter->first);
 		const LLSD& linksetData = linksetDataIter->second;
-		LLPathfindingObjectPtr linksetPtr(new LLPathfindingLinkset(uuid, linksetData));
-		objectMap.insert(std::pair<std::string, LLPathfindingObjectPtr>(uuid, linksetPtr));
+		if(linksetData.size() != 0)
+		{
+			LLPathfindingObjectPtr linksetPtr(new LLPathfindingLinkset(uuid, linksetData));
+			objectMap.insert(std::pair<std::string, LLPathfindingObjectPtr>(uuid, linksetPtr));
+		}
 	}
 }