Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear

Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp

indra/newview/llpreviewtexture.cpp

@@ -469,7 +469,7 @@ LLUUID LLPreviewTexture::getItemID()
 		if ((perms & PERM_TRANSFER) &&
 			(perms & PERM_COPY))
 		{
-			return item->getUUID();
+			return item->getAssetUUID();
 		}
 	}
 	return LLUUID::null;