From 5545505d0461726b7a617684fc4a4e2692469f6d Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 20 Sep 2024 16:34:38 -0400
Subject: Update test for changed message in error case.
---
indra/llcommon/tests/llleap_test.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra')
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp
index ca1939c81e..a345608299 100644
--- a/indra/llcommon/tests/llleap_test.cpp
+++ b/indra/llcommon/tests/llleap_test.cpp
@@ -300,8 +300,8 @@ namespace tut
std::string threw = catch_what<LLLeap::Error>([&BADPYTHON](){
LLLeap::create("bad exe", BADPYTHON);
});
- ensure_contains("LLLeap::create() didn't throw", threw, "failed");
- log.messageWith("failed");
+ ensure_contains("LLLeap::create() didn't throw", threw, "Can't find");
+ log.messageWith("Can't find");
log.messageWith(BADPYTHON);
// try the suppress-exception variant
ensure("bad launch returned non-NULL", ! LLLeap::create("bad exe", BADPYTHON, false));
--
cgit v1.2.3
From 65379a3b1784209193fda64fa6e99cfb9b87c340 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 20 Sep 2024 16:39:13 -0400
Subject: Fix trailing spaces.
---
indra/newview/llluamanager.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra')
diff --git a/indra/newview/llluamanager.cpp b/indra/newview/llluamanager.cpp
index 046526ac3c..7fe5c1ece0 100644
--- a/indra/newview/llluamanager.cpp
+++ b/indra/newview/llluamanager.cpp
@@ -204,7 +204,7 @@ void LLLUAmanager::runScriptFile(const std::string &filename, bool autorun,
result_cb(-1, error);
}
return;
- }
+ }
llifstream in_file;
in_file.open(command.script);
--
cgit v1.2.3