diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-04 16:26:24 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-04 16:26:24 -0400 |
| commit | 01d20da6709997f91243ddf8b1d71020920ffc7d (patch) | |
| tree | 8273d0eb8f6e80ff09f85c6c4828d7f619feb18a /indra/newview | |
| parent | d72ddddcaf07a1b9c7fb479e2432cf1bfa286a94 (diff) | |
| parent | 5319d314206c7c1c21b2bbd3a661c0c520373dcc (diff) | |
Merge branch 'lua-merge' of github.com:secondlife/viewer into lua-merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatersettingsdebug.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/tests/llluamanager_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp index 9c87e6fb3b..63ae1e60e8 100644 --- a/indra/newview/llfloatersettingsdebug.cpp +++ b/indra/newview/llfloatersettingsdebug.cpp @@ -660,5 +660,5 @@ void LLFloaterSettingsDebug::hideUIControls() void LLFloaterSettingsDebug::onClickCopy() { std::string setting_name = mSettingName->getText(); - LLClipboard::instance().copyToClipboard(utf8str_to_wstring(setting_name), 0, setting_name.size()); + LLClipboard::instance().copyToClipboard(utf8str_to_wstring(setting_name), 0, narrow(setting_name.size())); } diff --git a/indra/newview/tests/llluamanager_test.cpp b/indra/newview/tests/llluamanager_test.cpp index 4b143b52db..8ce5c357e0 100644 --- a/indra/newview/tests/llluamanager_test.cpp +++ b/indra/newview/tests/llluamanager_test.cpp @@ -287,7 +287,7 @@ namespace tut while (expect_array.size() > 0 && send_array[expect_array.size() - 1].isUndefined()) { - expect_array.erase(expect_array.size() - 1); + expect_array.erase(LLSD::Integer(expect_array.size() - 1)); } round_trip("array", send_array, expect_array); |