mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge remote-tracking branch 'origin/master' into develop
# Conflicts: # Moose Development/Moose/Sound/SRS.lua
This commit is contained in:
commit
8a6cbeda74
@ -824,7 +824,7 @@ function MSRS:SetVoiceProvider(Voice, Provider)
|
||||
self:F( {Voice=Voice, Provider=Provider} )
|
||||
self.poptions=self.poptions or {}
|
||||
|
||||
self.poptions[Provider or self:GetProvider()].voice =Voice
|
||||
self.poptions[Provider or self:GetProvider()].voice=Voice
|
||||
|
||||
return self
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user