Ansariel 2ba4a164e2 Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # autobuild.xml # indra/cmake/Python.cmake # indra/lib/python/indra/util/llmanifest.py # indra/lib/python/indra/util/test_win32_manifest.py # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/llaudio/llstreamingaudio_fmodstudio.h # indra/llcommon/llerror.cpp # indra/newview/llappviewer.cpp # indra/newview/lleventnotifier.cpp # indra/newview/llpanellandmarks.cpp # indra/newview/llpreviewanim.cpp # indra/newview/llpreviewanim.h # indra/newview/llviewerregion.cpp # indra/newview/skins/default/xui/de/menu_place_add_button.xml # indra/newview/skins/default/xui/it/menu_place_add_button.xml # indra/newview/skins/default/xui/it/menu_teleport_history_item.xml # indra/newview/skins/default/xui/ja/menu_place_add_button.xml # indra/newview/skins/default/xui/pl/menu_place_add_button.xml # indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml # indra/newview/skins/default/xui/ru/menu_place_add_button.xml # indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml # indra/newview/viewer_manifest.py		2021-12-16 12:32:34 +01:00
..
code_tools	SL-15742: Convert build scripts to Python 3	2021-12-10 14:42:49 -08:00
content_tools	SL-15742: Convert build scripts to Python 3	2021-12-10 14:42:49 -08:00
messages	SL-13313 Updated message_template.msg.sha1	2021-08-31 22:27:45 +03:00
metrics	SL-15742: Convert build scripts to Python 3	2021-12-10 14:42:49 -08: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	Strip off _x64 when converting channel > bugsplat db. We do not want x64 and x86 crashes in different databases.	2021-09-26 12:25:45 -04: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	SL-15742: Convert build scripts to Python 3	2021-12-10 14:42:49 -08:00
packages-formatter.py	Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer	2021-12-16 12:32:34 +01:00
setup-path.py	SL-15742: Convert build scripts to Python 3	2021-12-10 14:42:49 -08:00
template_verifier.py	SL-15742: Convert build scripts to Python 3	2021-12-10 14:42:49 -08:00