From e8e28990a853cafc5a44ae5867d339aa0c545640 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 10 Mar 2020 01:36:23 -0400
Subject: [PATCH] Fix tests after RLVa merge
---
indra/llui/tests/llurlentry_test.cpp | 6 ++++++
indra/newview/tests/llslurl_test.cpp | 13 ++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp
index 119cbebc814..d0c5a32cbfd 100644
--- a/indra/llui/tests/llurlentry_test.cpp
+++ b/indra/llui/tests/llurlentry_test.cpp
@@ -86,6 +86,12 @@ S32 LLUIImage::getHeight() const
}
|*==========================================================================*/
+const std::string dogFace("DogFace");
+const std::string& rlvGetAnonym(const LLAvatarName& avName)
+{
+ return dogFace;
+}
+
namespace tut
{
struct LLUrlEntryData
diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp
index 5fd61c5a891..3213363a943 100644
--- a/indra/newview/tests/llslurl_test.cpp
+++ b/indra/newview/tests/llslurl_test.cpp
@@ -40,6 +40,9 @@ static const char * const TEST_FILENAME("llslurl_test.xml");
}
+class LLViewerFetchedTexture : public LLRefCount
+{};
+
//
// Stub implementation for LLTrans
//
@@ -69,7 +72,7 @@ bool RlvUtil::isNearbyRegion(const std::string& strRegion)
return false;
}
-RlvHandler::RlvHandler() : m_pGCTimer(NULL), m_pWLSnapshot(NULL)
+RlvHandler::RlvHandler() : m_pGCTimer(NULL)
{
// Array auto-initialization to 0 is non-standard? (Compiler warning in VC-8.0)
memset(m_Behaviours, 0, sizeof(S16) * RLV_BHVR_COUNT);
@@ -79,6 +82,14 @@ RlvHandler::~RlvHandler()
{
}
+void RlvHandler::changed(const LLUUID& idGroup, LLGroupChange change)
+{}
+
+bool RlvHandler::handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& sdUserdata)
+{
+ return true;
+}
+
RlvHandler gRlvHandler;
// [/RLVa:KB]
--
GitLab