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/llprimitive/tests/llmediaentry_test.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/llprimitive/tests/llmediaentry_test.cpp')
| -rw-r--r-- | indra/llprimitive/tests/llmediaentry_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp index b072ce3964..c3e17d1267 100644 --- a/indra/llprimitive/tests/llmediaentry_test.cpp +++ b/indra/llprimitive/tests/llmediaentry_test.cpp @@ -211,7 +211,7 @@ namespace tut void whitelist_test(int num, bool enable, const char *whitelist, const char *candidate_url, bool expected_pass) { - std::string message = "Whitelist test " + boost::lexical_cast<std::string>(num); + std::string message = "Whitelist test " + std::to_string(num); LLMediaEntry entry; entry.setWhiteListEnable(enable); set_whitelist(entry, whitelist); |