livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llinventory
History
Ansariel 1fc3aaff9b Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	.gitignore
#	autobuild.xml
#	indra/CMakeLists.txt
#	indra/cmake/00-Common.cmake
#	indra/cmake/Boost.cmake
#	indra/cmake/BuildVersion.cmake
#	indra/cmake/CEFPlugin.cmake
#	indra/cmake/CMakeLists.txt
#	indra/cmake/CURL.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/DBusGlib.cmake
#	indra/cmake/DragDrop.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/cmake/FindHUNSPELL.cmake
#	indra/cmake/FindJsonCpp.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/FindURIPARSER.cmake
#	indra/cmake/FreeType.cmake
#	indra/cmake/GLH.cmake
#	indra/cmake/Hunspell.cmake
#	indra/cmake/JsonCpp.cmake
#	indra/cmake/LLKDU.cmake
#	indra/cmake/LLPhysicsExtensions.cmake
#	indra/cmake/LLPlugin.cmake
#	indra/cmake/LLWindow.cmake
#	indra/cmake/Linking.cmake
#	indra/cmake/MESHOPTIMIZER.cmake
#	indra/cmake/MediaPluginBase.cmake
#	indra/cmake/NGHTTP2.cmake
#	indra/cmake/OPENAL.cmake
#	indra/cmake/OpenGL.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/cmake/OpenSSL.cmake
#	indra/cmake/PNG.cmake
#	indra/cmake/Tracy.cmake
#	indra/cmake/UI.cmake
#	indra/cmake/Variables.cmake
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/cmake/ZLIBNG.cmake
#	indra/cmake/bugsplat.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/linux_crash_logger/CMakeLists.txt
#	indra/llaudio/CMakeLists.txt
#	indra/llcommon/CMakeLists.txt
#	indra/llcommon/llapp.cpp
#	indra/llcorehttp/CMakeLists.txt
#	indra/llimagej2coj/CMakeLists.txt
#	indra/llinventory/CMakeLists.txt
#	indra/llmath/CMakeLists.txt
#	indra/llmath/llcalcparser.h
#	indra/llmessage/CMakeLists.txt
#	indra/llprimitive/CMakeLists.txt
#	indra/llrender/CMakeLists.txt
#	indra/llrender/llglslshader.cpp
#	indra/llwindow/CMakeLists.txt
#	indra/media_plugins/CMakeLists.txt
#	indra/media_plugins/base/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llxmlrpclistener.cpp
#	indra/newview/llxmlrpctransaction.cpp
#	indra/newview/viewer_manifest.py
#	indra/test/CMakeLists.txt
 		2022-09-17 23:12:34 +02:00
..
tests SL-13669 tests should cover import/export category from llsd 2020-08-10 20:50:27 +03:00
CMakeLists.txt Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer 2022-09-17 23:12:34 +02:00
llcategory.cpp
…
llcategory.h
…
lleconomy.cpp
…
lleconomy.h
…
llfoldertype.cpp Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-12 11:56:45 +02:00
llfoldertype.h Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-12 11:56:45 +02:00
llinventory.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 17:31:39 +01:00
llinventory.h SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
llinventorydefines.cpp
…
llinventorydefines.h
…
llinventorysettings.cpp
…
llinventorysettings.h
…
llinventorytype.cpp
…
llinventorytype.h
…
llinvtranslationbrdg.h
…
lllandmark.cpp Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-29 11:41:06 +02:00
lllandmark.h SL-13986 Validate buffer size to avoid SIGBUS crash on sscanf 2020-09-23 22:44:17 +03:00
llnotecard.cpp
…
llnotecard.h
…
llparcel.cpp Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer 2022-09-17 14:37:33 +02:00
llparcel.h SL-16297 Support the parcel obscure_moap flag. 2021-12-17 18:13:20 +02:00
llparcelflags.h SL-14797 Normalize right-click menus on Landmarks & Picks Part#3 2021-02-09 01:59:15 +02:00
llpermissions.cpp Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer 2020-08-18 23:53:40 +02:00
llpermissions.h Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer 2020-08-18 23:53:40 +02:00
llpermissionsflags.h
…
llsaleinfo.cpp SL-13669 Change inventory cache to use a standard LLSD format 2020-08-04 15:30:20 +03:00
llsaleinfo.h SL-13669 Change inventory cache to use a standard LLSD format 2020-08-04 15:30:20 +03:00
llsettingsbase.cpp SL-16606: Add profiler category ENVIRONMENT 2022-01-14 11:50:19 -08:00
llsettingsbase.h SL-14575 Pass validation flags into EEP validators. 2021-01-13 20:47:20 +02:00
llsettingsdaycycle.cpp Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
llsettingsdaycycle.h
…
llsettingssky.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
llsettingssky.h SL-16127: Make another pass removing redundant LLSD op [] calls, unused vars, and use atmospheric already calculated 2021-10-27 10:05:13 -07:00
llsettingswater.cpp Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
llsettingswater.h
…
lltransactionflags.cpp
…
lltransactionflags.h
…
lltransactiontypes.h
…
lluserrelations.cpp
…
lluserrelations.h
…