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
..
Resources	SL-702: refactor to make the viewer-manager easier for TPVs to integrate	2017-05-24 09:41:44 -04:00
login	Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer	2021-12-16 12:32:34 +01:00
CMakeLists.txt	SL-323: first pass at ripping out old updater	2016-08-18 13:05:30 -07:00