Ansariel 8abb2cd6b3 Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llfloatersavecamerapreset.cpp # indra/newview/llpanelvolumepulldown.cpp # indra/newview/llpanelvolumepulldown.h # indra/newview/llpresetsmanager.cpp # indra/newview/skins/default/xui/en/floater_camera.xml		2020-04-23 19:21:00 +02:00
..
tests	SL-10153: Review and rationalize fetching paths from environment.	2018-12-14 15:38:13 -05:00
CMakeLists.txt	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
llcontrol.cpp	Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer	2020-04-23 19:21:00 +02:00
llcontrol.h	Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer	2020-04-23 19:21:00 +02:00
llcontrolgroupreader.h	SL-12904 FIXED Camera Preset does not restore correctly when sitting	2020-04-20 14:27:22 +03:00
llxmlnode.cpp	Merge viewer-quickgraphics	2016-03-08 01:41:31 +01:00
llxmlnode.h	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
llxmlparser.cpp	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
llxmlparser.h	remove execute permission from many files that should not have it	2015-11-10 09:48:56 -05:00
llxmltree.cpp	Merge viewer-quickgraphics	2016-03-08 01:41:31 +01:00
llxmltree.h	Merge viewer-quickgraphics	2016-03-08 01:41:31 +01:00