Steve Bennetts 65bf35cfed merge		2009-10-19 10:49:48 -07:00
..
tests	DEV-41404 convert monolithic tut llinventoryparcel test to llinventory integration test.	2009-10-16 12:45:19 +00:00
CMakeLists.txt	DEV-41404 convert monolithic tut llinventoryparcel test to llinventory integration test.	2009-10-16 12:45:19 +00:00
llcategory.cpp	…
llcategory.h	…
lleconomy.cpp	…
lleconomy.h	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	2009-06-21 08:04:56 +00:00
llinventory.cpp	Merge with trunk	2009-08-31 13:47:47 -07:00
llinventory.h	Merge	2009-09-08 14:49:49 -07:00
llinventorytype.cpp	For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"	2009-07-24 00:46:26 +00:00
llinventorytype.h	For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"	2009-07-24 00:46:26 +00:00
lllandmark.cpp	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	2009-06-21 08:04:56 +00:00
lllandmark.h	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	2009-06-21 08:04:56 +00:00
llnotecard.cpp	…
llnotecard.h	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	2009-06-21 08:04:56 +00:00
llparcel.cpp	merge from latest svn/viewer-2-0 to hg/viewer-2-0	2009-10-16 16:42:45 -07:00
llparcel.h	Merge with trunk	2009-08-31 13:47:47 -07:00
llparcelflags.h	…
llpermissions.cpp	Merge with trunk	2009-08-31 13:47:47 -07:00
llpermissions.h	Merge with trunk	2009-08-31 13:47:47 -07:00
llpermissionsflags.h	Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:	2009-07-07 00:53:05 +00:00
llsaleinfo.cpp	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	2009-06-21 08:04:56 +00:00
llsaleinfo.h	merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3	2009-06-21 08:04:56 +00:00
lltransactionflags.cpp	…
lltransactionflags.h	…
lltransactiontypes.h	svn merge -r 129999:132607 svn+ssh://svn/svn/linden/branches/server/server-1.30 into trunk	2009-09-04 02:27:28 +00:00
lluserrelations.cpp	…
lluserrelations.h	…