3 Commits

Author	SHA1	Message	Date
Lirusaito	5a9a0e0b1b	Upload code cleansing ... I found our upload classes were in need of a tune up while researching Issue 896: Animation upload setting causes viewer crash So I started working to clean up llfloaterbvhpreview which lead me to llfloaternamedesc and the rest of our upload floaters I ended up pulling the sound upload hack out of LLFloaterNameDesc and into LLFloaterSoundPreview and moving LLFloaterAnimPreview into llfloaternamedesc.* Updated llviewermenufile.cpp a bit Removed setUploadAmount from LLFloaterImagePreview and LLFloaterBvhPreview as its purpose is served by LLGlobalEconomy::getPriceUpload and the hippogridmanager too. Fixed an issue with floater_animation_anim_preview.xml using [AMOUNT] instead of [UPLOADFEE] for its label. I'd say this might fix Issue 896, I certainly can't reproduce the crash I was having when testing for it anymore.	2013-06-26 03:51:27 -04:00
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