From a92f08b2bc0ee5a63f678c55f9a9d0ec0c4ff574 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Mon, 13 Feb 2023 15:08:51 -0800
Subject: [PATCH] Fix up a couple of tiny merge conflicts after a merge with
 main

---
 indra/llcommon/llsdserialize.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
index cf6c1ab73a9..2f12c6d1ff6 100644
--- a/indra/llcommon/llsdserialize.h
+++ b/indra/llcommon/llsdserialize.h
@@ -870,7 +870,7 @@ class LL_COMMON_API LLUZipHelper : public LLRefCount
 LL_COMMON_API std::string zip_llsd(LLSD& data);
 
 
-LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize,std::istream& is, S32 size);
+LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, size_t& outsize,std::istream& is, S32 size);
 
 // returns a pointer to the array or past the array if the deprecated header exists
 LL_COMMON_API char* strip_deprecated_header(char* in, U32& cur_size, U32* header_size = nullptr);
-- 
GitLab