Merge branch 'fix-audio-mixer-data-race-0' of github.com:sethalves/hifi into fix-audio-mixer-data-race-1

This commit is contained in:
Seth Alves 2016-10-18 13:58:08 -07:00
commit cb38f144e4

View file

@ -57,8 +57,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri
auto scriptableAvatar = DependencyManager::set<ScriptableAvatar>();
auto addressManager = DependencyManager::set<AddressManager>();
if (requestAssignmentType != Assignment::AvatarMixerType &&
requestAssignmentType != Assignment::AudioMixerType) {
if (requestAssignmentType == Assignment::AgentType) {
auto scriptEngines = DependencyManager::set<ScriptEngines>();
}