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);