From f36cffe7b5296bd50e24fab0b67a59f18836ab53 Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Thu, 27 Jul 2017 12:03:24 -0700 Subject: Fix return value so that LLSD assignment operator is unambiguous --- indra/newview/llversioninfo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llversioninfo.h b/indra/newview/llversioninfo.h index 99f6c8e87f..b8b4341385 100644 --- a/indra/newview/llversioninfo.h +++ b/indra/newview/llversioninfo.h @@ -73,7 +73,7 @@ public: static void resetChannel(const std::string& channel); /// return the bit width of an address - static const U32 getAddressSize() { return ADDRESS_SIZE; } + static const S32 getAddressSize() { return ADDRESS_SIZE; } typedef enum { -- cgit v1.2.3