| .. |
|
tests
|
Redo Bao's broken merge
|
2009-11-04 14:59:23 -08:00 |
|
CMakeLists.txt
|
DEV-41404 convert monolithic tut llinventoryparcel test to llinventory integration test.
|
2009-10-16 12:45:19 +00: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
|
Redo Bao's broken merge
|
2009-11-04 14:59:23 -08:00 |
|
llinventory.h
|
Header file cleanup.
|
2009-11-16 18:40:59 -05:00 |
|
llinventorytype.cpp
|
EXT-2482 : Newly created folders have wrong default type
|
2009-11-13 16:18:53 -05:00 |
|
llinventorytype.h
|
Redo Bao's broken merge
|
2009-11-04 14:59:23 -08: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
|
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 |
|
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
|
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
|
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
|
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 |