4 Commits

Author	SHA1	Message	Date
Shyotl	77f09744ab	Merge branch 'AlericMaster' into V2Renderer ... Conflicts: indra/llcommon/aithreadsafe.h indra/newview/pipeline.cpp	2011-05-20 12:56:23 -05:00
Shyotl	51338470b5	Pulled LLEventTimer out of lltimer.h/cpp and into lleventtimer.h/cpp ... LLInstanceTracker added to llcommon (pulled from llui in v2 for usage elsewhere) LLEventTimer now using LLInstanceTracker Updated LLLiveAppConfig (Though it appears unused, really) processor.h is obsolete, thus removed. (llprocessor.h replaces it)	2011-05-15 22:40:59 -05:00
Aleric Inglewood	e0b0fa4f58	Use AIFilePicker everywhere. ... Also upgrade the file picker filters with the new extensions found in the orginal file picker code of Singularity. Also improve AIFilePicker a bit: added hasFilename() and now deleting the statemachine automatically by default: it's no longer needed to call deleteMe from the callback.	2011-05-10 04:27:57 +02:00
Siana Gearz	633b6d22f2	Emerald Local Assets	2011-03-03 03:30:58 +01:00