summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2017-07-27 12:03:24 -0700
committerGlenn Glazer <coyot@lindenlab.com>2017-07-27 12:03:24 -0700
commitf36cffe7b5296bd50e24fab0b67a59f18836ab53 (patch)
tree9b4406ffb647462a7e9f89277ab5ce812b7329a7 /indra/newview
parent745243b48674eb02984c15dcbcb15854eacd1c81 (diff)
Fix return value so that LLSD assignment operator is unambiguous
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llversioninfo.h2
1 files changed, 1 insertions, 1 deletions
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
{