Ansariel 7427b46ea5 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # .gitignore # indra/cmake/Copy3rdPartyLibs.cmake # indra/llcommon/llcommon.cpp # indra/llcommon/llerror.cpp # indra/llcommon/llprofiler.h # indra/llcommon/llthread.cpp # indra/llimage/llimageworker.cpp # indra/llprimitive/llmodel.h # indra/llrender/llfontgl.cpp # indra/llrender/llfontgl.h # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llrender/llvertexbuffer.h # indra/llwindow/llwindowmacosx.h # indra/llwindow/llwindowwin32.cpp # indra/llwindow/llwindowwin32.h # indra/newview/app_settings/settings.xml # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h # indra/newview/lldrawpoolavatar.cpp # indra/newview/lldrawpoolavatar.h # indra/newview/lldynamictexture.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llimview.cpp # indra/newview/llmeshrepository.h # indra/newview/llmodelpreview.cpp # indra/newview/llnetmap.cpp # indra/newview/llskinningutil.cpp # indra/newview/llskinningutil.h # indra/newview/llspatialpartition.cpp # indra/newview/llteleporthistory.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewerobjectlist.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoicevivox.cpp # indra/newview/llvosky.cpp # indra/newview/llvovolume.cpp		2021-11-12 15:21:52 +01:00
..
code_tools	SL-13705 - added --deleted option to collect info on no-longer-needed text in translated files. Processing needs to be automated as the list is unfeasibly long.	2020-09-18 16:22:54 +01:00
content_tools	SL-13000 - standard params for jellied male/female avs	2020-05-13 21:09:48 +01:00
messages	Merge viewer-eep	2018-12-13 21:14:20 +01:00
metrics	SL-15031 - more viewerstats.py support for cleaning up unused settings	2021-04-07 19:48:27 +01:00
perf	SL-15999 - made cwd handling a bit more robust in perfbot_run.py	2021-10-22 18:49:54 +01:00
templates	Update Mac and Windows breakpad builds to latest	2013-03-29 07:50:08 -07:00
testing/lsl	SL-751 - updated lsl test scripts with bug fix, added a version that uses the new command llGetObjectAnimationNames()	2017-08-31 16:48:26 +01:00
configure_firestorm.sh	Initial merge of DRTVWR-541 into FS	2021-10-09 20:18:14 +01:00
export_for_merge.sh	Scripts for release merging.	2014-05-12 14:53:41 +02:00
import_to_branch.sh	Remove references to GCC package override file	2018-01-31 16:31:41 +01:00
md5check.py	Merge	2011-03-31 14:07:54 -07:00
packages-formatter.py	Merge viewer64	2017-11-05 12:46:02 +01:00
setup-path.py	Update Mac and Windows breakpad builds to latest	2013-03-29 07:50:08 -07:00
template_verifier.py	Update message template master URL	2020-05-21 00:35:09 +02:00