diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-15 15:29:23 +0000 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-15 15:29:23 +0000 |
| commit | b77d109d46e866422cfc12dc6789acf0ed988089 (patch) | |
| tree | 26c130811f7a0b339104530f872c9d5fb7659d69 /indra/newview | |
| parent | bafe85a0f6e86912c43caaf4779cb4daa54c9ba3 (diff) | |
| parent | f36cffe7b5296bd50e24fab0b67a59f18836ab53 (diff) | |
Merged in lindenlab/viewer64-maint-7643 (pull request #17)
MAINT-7643
Approved-by: Oz Linden <oz@lindenlab.com>
Approved-by: Nat Linden <nat@lindenlab.com>
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llversioninfo.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 10cd58476a..b6f705f21a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3356,6 +3356,7 @@ void LLAppViewer::writeSystemInfo() gDebugInfo["ClientInfo"]["MinorVersion"] = LLVersionInfo::getMinor(); gDebugInfo["ClientInfo"]["PatchVersion"] = LLVersionInfo::getPatch(); gDebugInfo["ClientInfo"]["BuildVersion"] = LLVersionInfo::getBuild(); + gDebugInfo["ClientInfo"]["AddressSize"] = LLVersionInfo::getAddressSize(); gDebugInfo["CAFilename"] = gDirUtilp->getCAFile(); diff --git a/indra/newview/llversioninfo.h b/indra/newview/llversioninfo.h index ec599c0cda..b8b4341385 100644 --- a/indra/newview/llversioninfo.h +++ b/indra/newview/llversioninfo.h @@ -72,6 +72,9 @@ public: /// reset the channel name used by the viewer. static void resetChannel(const std::string& channel); + /// return the bit width of an address + static const S32 getAddressSize() { return ADDRESS_SIZE; } + typedef enum { TEST_VIEWER, |