11 commits

Author	SHA1	Message	Date
Stephen Birarda	e51aedeb35	fix error handling for diff request types	2016-03-11 11:36:52 -08:00
Stephen Birarda	625032f748	fix for add to world after upload name change	2016-03-10 17:10:49 -08:00
Stephen Birarda	979fda7c8b	add trimming for upload mapping	2016-03-10 16:57:39 -08:00
Stephen Birarda	96a112290f	use mapping for overwrite prompt	2016-03-10 16:56:22 -08:00
Atlante45	35f5ebb938	Don't allow folder overwrite	2016-03-10 16:44:39 -08:00
Ryan Huffman	ad0fb18d81	Add / to beginning of mapping on upload if missing	2016-03-10 16:02:41 -08:00
Ryan Huffman	2d4864ed33	Merge branch 'atp' of github.com:birarda/hifi into atp-more	2016-03-10 15:40:07 -08:00
Atlante45	a6ccfb1685	CR	2016-03-10 15:11:39 -08:00
Atlante45	63571a7c36	Make sure Upload is not clicked several times	2016-03-10 14:59:20 -08:00
Atlante45	548d826a4e	Couple bug fixes	2016-03-10 14:59:20 -08:00
Atlante45	7d7a683b18	Add uploadFile method that prompts the user	2016-03-10 14:59:20 -08:00

Renamed from libraries/script-engine/src/AssetMappingsScriptingInterface.cpp (Browse further)