diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-07 09:46:02 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-07 09:46:02 -0500 |
| commit | c7ebeb842010c4a814978f63c464e1546bd6a9be (patch) | |
| tree | de77b0d9a9fe53ff35d660b0e8731b91abe2ff94 /indra/llinventory | |
| parent | 8c7a8bdc4a795a158dc8a47928245b0dd74df3f5 (diff) | |
| parent | 4fd57774dd8491ffc760114b6d89fd0ab1989bbd (diff) | |
merge with El Capitan and packaging fixes
Diffstat (limited to 'indra/llinventory')
31 files changed, 0 insertions, 0 deletions
diff --git a/indra/llinventory/CMakeLists.txt b/indra/llinventory/CMakeLists.txt index 0a1f93bd80..0a1f93bd80 100755..100644 --- a/indra/llinventory/CMakeLists.txt +++ b/indra/llinventory/CMakeLists.txt diff --git a/indra/llinventory/llcategory.cpp b/indra/llinventory/llcategory.cpp index 97a496845b..97a496845b 100755..100644 --- a/indra/llinventory/llcategory.cpp +++ b/indra/llinventory/llcategory.cpp diff --git a/indra/llinventory/llcategory.h b/indra/llinventory/llcategory.h index 390a8a1f1e..390a8a1f1e 100755..100644 --- a/indra/llinventory/llcategory.h +++ b/indra/llinventory/llcategory.h diff --git a/indra/llinventory/lleconomy.cpp b/indra/llinventory/lleconomy.cpp index e10402196f..e10402196f 100755..100644 --- a/indra/llinventory/lleconomy.cpp +++ b/indra/llinventory/lleconomy.cpp diff --git a/indra/llinventory/lleconomy.h b/indra/llinventory/lleconomy.h index 47fcf688a2..47fcf688a2 100755..100644 --- a/indra/llinventory/lleconomy.h +++ b/indra/llinventory/lleconomy.h diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp index 86aca77de8..86aca77de8 100755..100644 --- a/indra/llinventory/llfoldertype.cpp +++ b/indra/llinventory/llfoldertype.cpp diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp index 11647c5518..11647c5518 100755..100644 --- a/indra/llinventory/llinventory.cpp +++ b/indra/llinventory/llinventory.cpp diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 70b200e139..70b200e139 100755..100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h diff --git a/indra/llinventory/llinventorydefines.cpp b/indra/llinventory/llinventorydefines.cpp index 575331a263..575331a263 100755..100644 --- a/indra/llinventory/llinventorydefines.cpp +++ b/indra/llinventory/llinventorydefines.cpp diff --git a/indra/llinventory/llinventorydefines.h b/indra/llinventory/llinventorydefines.h index 3881fb1fd7..3881fb1fd7 100755..100644 --- a/indra/llinventory/llinventorydefines.h +++ b/indra/llinventory/llinventorydefines.h diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp index 8807b36117..8807b36117 100755..100644 --- a/indra/llinventory/llinventorytype.cpp +++ b/indra/llinventory/llinventorytype.cpp diff --git a/indra/llinventory/llinventorytype.h b/indra/llinventory/llinventorytype.h index fc3c78cf50..fc3c78cf50 100755..100644 --- a/indra/llinventory/llinventorytype.h +++ b/indra/llinventory/llinventorytype.h diff --git a/indra/llinventory/lllandmark.cpp b/indra/llinventory/lllandmark.cpp index 4c6075d6b5..4c6075d6b5 100755..100644 --- a/indra/llinventory/lllandmark.cpp +++ b/indra/llinventory/lllandmark.cpp diff --git a/indra/llinventory/lllandmark.h b/indra/llinventory/lllandmark.h index 92923ea6fb..92923ea6fb 100755..100644 --- a/indra/llinventory/lllandmark.h +++ b/indra/llinventory/lllandmark.h diff --git a/indra/llinventory/llnotecard.cpp b/indra/llinventory/llnotecard.cpp index 908c647498..908c647498 100755..100644 --- a/indra/llinventory/llnotecard.cpp +++ b/indra/llinventory/llnotecard.cpp diff --git a/indra/llinventory/llnotecard.h b/indra/llinventory/llnotecard.h index d64a821b78..d64a821b78 100755..100644 --- a/indra/llinventory/llnotecard.h +++ b/indra/llinventory/llnotecard.h diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 0908613c10..0908613c10 100755..100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index e68331b99a..e68331b99a 100755..100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h diff --git a/indra/llinventory/llparcelflags.h b/indra/llinventory/llparcelflags.h index 25b27a281a..25b27a281a 100755..100644 --- a/indra/llinventory/llparcelflags.h +++ b/indra/llinventory/llparcelflags.h diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp index e79b753514..e79b753514 100755..100644 --- a/indra/llinventory/llpermissions.cpp +++ b/indra/llinventory/llpermissions.cpp diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h index 89c66f6ebd..89c66f6ebd 100755..100644 --- a/indra/llinventory/llpermissions.h +++ b/indra/llinventory/llpermissions.h diff --git a/indra/llinventory/llpermissionsflags.h b/indra/llinventory/llpermissionsflags.h index 9ecf465c8c..9ecf465c8c 100755..100644 --- a/indra/llinventory/llpermissionsflags.h +++ b/indra/llinventory/llpermissionsflags.h diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp index 63e34d188e..63e34d188e 100755..100644 --- a/indra/llinventory/llsaleinfo.cpp +++ b/indra/llinventory/llsaleinfo.cpp diff --git a/indra/llinventory/llsaleinfo.h b/indra/llinventory/llsaleinfo.h index 4e98ccf6ff..4e98ccf6ff 100755..100644 --- a/indra/llinventory/llsaleinfo.h +++ b/indra/llinventory/llsaleinfo.h diff --git a/indra/llinventory/lltransactionflags.cpp b/indra/llinventory/lltransactionflags.cpp index e21f29df41..e21f29df41 100755..100644 --- a/indra/llinventory/lltransactionflags.cpp +++ b/indra/llinventory/lltransactionflags.cpp diff --git a/indra/llinventory/lltransactionflags.h b/indra/llinventory/lltransactionflags.h index 8227f3bcc2..8227f3bcc2 100755..100644 --- a/indra/llinventory/lltransactionflags.h +++ b/indra/llinventory/lltransactionflags.h diff --git a/indra/llinventory/lltransactiontypes.h b/indra/llinventory/lltransactiontypes.h index 6f8d005f1b..6f8d005f1b 100755..100644 --- a/indra/llinventory/lltransactiontypes.h +++ b/indra/llinventory/lltransactiontypes.h diff --git a/indra/llinventory/lluserrelations.cpp b/indra/llinventory/lluserrelations.cpp index b938dfeb7b..b938dfeb7b 100755..100644 --- a/indra/llinventory/lluserrelations.cpp +++ b/indra/llinventory/lluserrelations.cpp diff --git a/indra/llinventory/lluserrelations.h b/indra/llinventory/lluserrelations.h index 9fbf36f0e2..9fbf36f0e2 100755..100644 --- a/indra/llinventory/lluserrelations.h +++ b/indra/llinventory/lluserrelations.h diff --git a/indra/llinventory/tests/inventorymisc_test.cpp b/indra/llinventory/tests/inventorymisc_test.cpp index 7b15552f24..7b15552f24 100755..100644 --- a/indra/llinventory/tests/inventorymisc_test.cpp +++ b/indra/llinventory/tests/inventorymisc_test.cpp diff --git a/indra/llinventory/tests/llparcel_test.cpp b/indra/llinventory/tests/llparcel_test.cpp index f2e4b03ff7..f2e4b03ff7 100755..100644 --- a/indra/llinventory/tests/llparcel_test.cpp +++ b/indra/llinventory/tests/llparcel_test.cpp |