Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git

Conflicts:
	indra/newview/llnetmap.cpp

indra/newview/llviewerobject.cpp

@@ -2622,6 +2622,7 @@ void LLViewerObject::saveScript(
 	 * interaction with doUpdateInventory() called below.
 	 */
 	lldebugs << "LLViewerObject::saveScript() " << item->getUUID() << " " << item->getAssetUUID() << llendl;
+
 	LLPointer<LLViewerInventoryItem> task_item =
 		new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(),
 								  item->getAssetUUID(), item->getType(),