diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-24 10:04:08 -0400 | 
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-24 10:04:08 -0400 | 
| commit | a9cf2a63555fbd2f7d256182ff6981e42cf8f257 (patch) | |
| tree | ff263de6c7f9eb7efd17a872a88aed3cfd4c5b69 | |
| parent | 94c5f1475efcee3f1f1407736c53eddf5f9d3ae2 (diff) | |
| parent | 5c45b4ac36a4cd95d6cc3b6066e0dd2fb2125de1 (diff) | |
merge changes for MAINT-7594
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 6 | 
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index 4eb1909042..bef0ac9058 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -63,6 +63,11 @@  #include <boost/scoped_ptr.hpp>  #include <sstream> +// this can be removed once it is defined by the build for all forks +#ifndef ADDRESS_SIZE +#  define ADDRESS_SIZE 32 +#endif +  class LLLoginInstance::Disposable {  public:  	virtual ~Disposable() {} @@ -605,6 +610,7 @@ void LLLoginInstance::constructAuthParams(LLPointer<LLCredential> user_credentia  	request_params["version"] = LLVersionInfo::getVersion();  	request_params["channel"] = LLVersionInfo::getChannel();  	request_params["platform"] = mPlatform; +	request_params["address_size"] = ADDRESS_SIZE;  	request_params["platform_version"] = mPlatformVersion;  	request_params["platform_string"] = mPlatformVersionName;  	request_params["id0"] = mSerialNumber;  | 
