Andrey Lihatskiy a0d7d87355 Merge branch 'master' into DRTVWR-460 ... # Conflicts: # indra/llmath/llquaternion.h # indra/newview/lldrawpoolwater.cpp # indra/newview/lljoystickbutton.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/textures/textures.xml		2020-04-26 21:57:40 +03:00
..
tests	…
CMakeLists.txt	…
llcontrol.cpp	SL-12904 FIXED Camera Preset does not restore correctly when sitting	2020-04-20 14:27:22 +03:00
llcontrol.h	SL-12904 FIXED Camera Preset does not restore correctly when sitting	2020-04-20 14:27:22 +03:00
llcontrolgroupreader.h	SL-12904 FIXED Camera Preset does not restore correctly when sitting	2020-04-20 14:27:22 +03:00
llxmlnode.cpp	…
llxmlnode.h	…
llxmlparser.cpp	…
llxmlparser.h	…
llxmltree.cpp	SL-10566 Use vector for some high-traffic, low-item count containers instead of list.	2019-08-05 12:04:29 -07:00
llxmltree.h	SL-10566 Use vector for some high-traffic, low-item count containers instead of list.	2019-08-05 12:04:29 -07:00