Ansariel 2f42e999e0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/newview/llhudtext.cpp # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp		2022-08-31 16:04:49 +02:00
..
tests	…
CMakeLists.txt	This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal	2021-03-09 14:39:51 -08: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	…
lllandmark.h	…
llnotecard.cpp	…
llnotecard.h	…
llparcel.cpp	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-08-31 16:04:49 +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	…
llpermissions.h	…
llpermissionsflags.h	…
llsaleinfo.cpp	…
llsaleinfo.h	…
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	…