From 03d7f2b84daf9ab991de6cad7d6149abda1ef716 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 28 Aug 2024 21:16:56 -0400
Subject: Ditch trailing spaces.

---
 indra/llcommon/lua_function.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/llcommon/lua_function.cpp')

diff --git a/indra/llcommon/lua_function.cpp b/indra/llcommon/lua_function.cpp
index 880bc209f6..ffb90032d2 100644
--- a/indra/llcommon/lua_function.cpp
+++ b/indra/llcommon/lua_function.cpp
@@ -3,7 +3,7 @@
  * @author Nat Goodspeed
  * @date   2024-02-05
  * @brief  Implementation for lua_function.
- * 
+ *
  * $LicenseInfo:firstyear=2024&license=viewerlgpl$
  * Copyright (c) 2024, Linden Research, Inc.
  * $/LicenseInfo$
@@ -700,11 +700,11 @@ void LuaState::check_interrupts_counter()
     // of interrupting itself at a moment when re-entry is not valid. So only
     // touch data in this LuaState.
     ++mInterrupts;
-    if (mInterrupts > INTERRUPTS_MAX_LIMIT) 
+    if (mInterrupts > INTERRUPTS_MAX_LIMIT)
     {
         lluau::error(mState, "Possible infinite loop, terminated.");
     }
-    else if (mInterrupts % INTERRUPTS_SUSPEND_LIMIT == 0) 
+    else if (mInterrupts % INTERRUPTS_SUSPEND_LIMIT == 0)
     {
         LL_DEBUGS("Lua") << LLCoros::getName() << " suspending at " << mInterrupts
                          << " interrupts" << LL_ENDL;
-- 
cgit v1.2.3


From 5319d314206c7c1c21b2bbd3a661c0c520373dcc Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 4 Sep 2024 16:24:42 -0400
Subject: Windows build fixes

---
 indra/llcommon/lua_function.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llcommon/lua_function.cpp')

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))
         {
-- 
cgit v1.2.3