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 | |
| parent | d72ddddcaf07a1b9c7fb479e2432cf1bfa286a94 (diff) | |
| parent | 5319d314206c7c1c21b2bbd3a661c0c520373dcc (diff) | |
Merge branch 'lua-merge' of github.com:secondlife/viewer into lua-merge
| -rw-r--r-- | indra/llcommon/llcoromutex.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/lua_function.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llfloatersettingsdebug.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/tests/llluamanager_test.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/llcoromutex.h b/indra/llcommon/llcoromutex.h index e740e494c2..3405e79478 100644 --- a/indra/llcommon/llcoromutex.h +++ b/indra/llcommon/llcoromutex.h @@ -3,7 +3,7 @@ * @author Nat Goodspeed * @date 2024-09-04 * @brief Coroutine-aware synchronization primitives - * + * * $LicenseInfo:firstyear=2024&license=viewerlgpl$ * Copyright (c) 2024, Linden Research, Inc. * $/LicenseInfo$ diff --git a/indra/llcommon/lua_function.cpp b/indra/llcommon/lua_function.cpp index ffb90032d2..c0090dd395 100644 --- a/indra/llcommon/lua_function.cpp +++ b/indra/llcommon/lua_function.cpp @@ -418,7 +418,7 @@ void lua_pushllsd(lua_State* L, const LLSD& data) case LLSD::TypeMap: { // push a new table with space for our non-array keys - lua_createtable(L, 0, data.size()); + lua_createtable(L, 0, narrow(data.size())); for (const auto& pair: llsd::inMap(data)) { // push value -- so now table is at -2, value at -1 @@ -432,7 +432,7 @@ void lua_pushllsd(lua_State* L, const LLSD& data) case LLSD::TypeArray: { // push a new table with space for array entries - lua_createtable(L, data.size(), 0); + lua_createtable(L, narrow(data.size()), 0); lua_Integer key{ 0 }; for (const auto& item: llsd::inArray(data)) { 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); |