diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-04-24 09:43:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-04-24 09:43:04 -0400 |
| commit | fc71a9c1ed96cb1cb97124e3cceabdfa11e1cc75 (patch) | |
| tree | b8e19975b3acc800aeaf8c541a780dbb84dc1fd3 /indra/newview/llvoicevivox.cpp | |
| parent | a3cbd41543258818589dd0e368c68d2dc62b3398 (diff) | |
| parent | 5e40b5e64433b224be4dc220e4496dcd0a43f3f6 (diff) | |
Merge release/maint-yz to main on promotion of secondlife/viewer #736: Maintenance YZ 7.1.6.8745209917
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 1b9aef193c..310c9ee297 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -5971,7 +5971,7 @@ void LLVivoxVoiceClient::filePlaybackSetMode(bool vox, float speed) } //------------------------------------------------------------------------ -std::set<LLVivoxVoiceClient::sessionState::wptr_t> LLVivoxVoiceClient::sessionState::mSession; +std::set<LLVivoxVoiceClient::sessionState::wptr_t, std::owner_less<LLVivoxVoiceClient::sessionState::wptr_t>> LLVivoxVoiceClient::sessionState::mSession; LLVivoxVoiceClient::sessionState::sessionState() : |