From b4f174f9188e18ab66e0246ebd0bcf68fba9f067 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 19 Aug 2009 18:13:37 +0000
Subject: [PATCH] EXT-591 Create an Object (Build tool) will crash
viewer EXT-599 Time of the sent messages is '00-00' in the Group
chat EXT-598 Acquired/created date for all landmarks is 01/01/1970
---
indra/llcommon/llstring.h | 5 +++--
indra/newview/llinventoryfilter.cpp | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 65e005abfb7..f6bb0e0fe29 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -736,8 +736,9 @@ S32 LLStringUtilBase<T>::format(std::basic_string<T>& s, const LLSD& substitutio
{
std::basic_string<T> param;
if (tokens.size() > 2) param = tokens[2];
-
- found_replacement = formatDatetime (replacement, tokens[0], param, substitutions);
+
+ S32 secFromEpoch = (S32) substitutions["datetime"].asInteger();
+ found_replacement = formatDatetime (replacement, tokens[0], param, secFromEpoch);
}
if (found_replacement)
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index f5525ec1f29..c41900d6919 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -115,7 +115,7 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item)
if (listener->getInventoryType() == LLInventoryType::IT_NONE)
{
const LLInventoryObject *obj = gInventory.getObject(listener->getUUID());
- if (!obj->getIsLinkType())
+ if (obj && !obj->getIsLinkType())
{
passed_type = TRUE;
}
--
GitLab