Tofu Linden 1dade05ee7 YET another hairy merge from viewer-trunk. Conflicts resolved... so far.		2010-04-06 16:10:16 +01:00
..
tests	Redo Bao's broken merge	2009-11-04 14:59:23 -08:00
CMakeLists.txt	EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines	2010-04-05 15:02:36 -04:00
llcategory.cpp	…
llcategory.h	…
lleconomy.cpp	…
lleconomy.h	…
llinventory.cpp	EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines	2010-04-05 16:18:19 -04:00
llinventory.h	EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines	2010-04-05 16:13:02 -04:00
llinventorydefines.cpp	EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines	2010-04-05 15:02:36 -04:00
llinventorydefines.h	EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines	2010-04-05 15:02:36 -04:00
llinventorytype.cpp	Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0	2009-11-17 13:40:11 -08:00
llinventorytype.h	another hairy merge from viewer-trunk :(	2010-04-06 14:47:43 +01:00
lllandmark.cpp	…
lllandmark.h	…
llnotecard.cpp	CID-332	2010-01-29 14:34:21 -08:00
llnotecard.h	…
llparcel.cpp	EXT-5940 : Typedef all vector<LLUUID>'s	2010-03-29 16:33:35 -04:00
llparcel.h	EXT-5940 : Typedef all vector<LLUUID>'s	2010-03-29 16:33:35 -04:00
llparcelflags.h	…
llpermissions.cpp	EXT-5820 I can copy asset UUID from non-FULLPERM assets turning on admin mode.	2010-02-26 19:23:42 +00:00
llpermissions.h	EXT-5820 I can copy asset UUID from non-FULLPERM assets turning on admin mode.	2010-02-26 19:23:42 +00:00
llpermissionsflags.h	…
llsaleinfo.cpp	…
llsaleinfo.h	…
lltransactionflags.cpp	…
lltransactionflags.h	…
lltransactiontypes.h	…
lluserrelations.cpp	…
lluserrelations.h	…