summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llassetstorage.cpp2
-rwxr-xr-x[-rw-r--r--]indra/llmessage/tests/llmessageconfig_test.cpp2
-rwxr-xr-x[-rw-r--r--]indra/llmessage/tests/message_test.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
index 10fd56a68e..34eeacb273 100644
--- a/indra/llmessage/llassetstorage.cpp
+++ b/indra/llmessage/llassetstorage.cpp
@@ -467,7 +467,7 @@ bool LLAssetStorage::findInCacheAndInvokeCallback(const LLUUID& uuid, LLAssetTyp
else
{
LL_WARNS("AssetStorage") << "Asset vfile " << uuid << ":" << type
- << " found in static cache with bad size " << file.getSize() << ", ignoring" << LL_ENDL;
+ << " found in static cache with bad size " << size << ", ignoring" << LL_ENDL;
}
}
return false;
diff --git a/indra/llmessage/tests/llmessageconfig_test.cpp b/indra/llmessage/tests/llmessageconfig_test.cpp
index 93443467a2..b8942e99b3 100644..100755
--- a/indra/llmessage/tests/llmessageconfig_test.cpp
+++ b/indra/llmessage/tests/llmessageconfig_test.cpp
@@ -62,7 +62,7 @@ namespace tut
int rmfile = LLFile::remove((mTestConfigDir + "/message.xml"));
ensure_equals("rmfile value", rmfile, 0);
// rm temp dir
- int rmdir = LLFile::rmdir(mTestConfigDir);
+ int rmdir = LLFile::remove(mTestConfigDir);
ensure_equals("rmdir value", rmdir, 0);
}
diff --git a/indra/llmessage/tests/message_test.cpp b/indra/llmessage/tests/message_test.cpp
index 11cd710ef6..6fb2b92803 100644..100755
--- a/indra/llmessage/tests/message_test.cpp
+++ b/indra/llmessage/tests/message_test.cpp
@@ -113,7 +113,7 @@ namespace tut
ensure_equals("rmfile value", rmfile, 0);
// rm temp dir
- int rmdir = LLFile::rmdir(mTestConfigDir);
+ int rmdir = LLFile::remove(mTestConfigDir);
ensure_equals("rmdir value", rmdir, 0);
}