2 Commits

Author	SHA1	Message	Date
Shyotl	e8ce35ebf8	Merge branch 'master' into UICleanup ... Conflicts: indra/llcommon/llstl.h indra/newview/jcfloaterareasearch.cpp indra/newview/jcfloaterareasearch.h indra/newview/llfloateranimpreview.cpp indra/newview/llfloateranimpreview.h indra/newview/llfloaterperms.cpp indra/newview/llfloaterproperties.cpp indra/newview/llpanelpermissions.cpp indra/newview/llviewermenu.cpp	2013-05-03 21:41:51 -05:00
Aleric Inglewood	fb2f0dd164	Add support for uploading .anim files. ... Mostly works, but indra/newview/skins/default/xui/en-us/floater_animation_anim_preview.xml needs work (the 'Name:' should be at the top, not the bottom). Also, it asks if you want to upload this as temporary. It shouldn't do that.	2013-04-25 19:05:52 +02:00