..
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
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
llcategory.h
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
lleconomy.cpp
QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
2009-02-03 17:56:26 +00:00
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
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-7305 : FIXED : Changed LLWearableDictionary to LLWearableType
2010-05-11 15:08:29 -04:00
llinventorytype.cpp
DEV-49349 : AIS hides broken inventory links after a relog
2010-04-27 18:39:09 -04:00
llinventorytype.h
EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanup
2010-04-02 11:56:52 -04: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
CID-332
2010-01-29 14:34:21 -08:00
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
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
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
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
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
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
lltransactionflags.h
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
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
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
lluserrelations.h
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
adc0aba2dd