diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llsecapi.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llsecapi.h | 6 | ||||
| -rw-r--r-- | indra/newview/tests/llsechandler_basic_test.cpp | 8 | 
3 files changed, 16 insertions, 5 deletions
diff --git a/indra/newview/llsecapi.cpp b/indra/newview/llsecapi.cpp index 10e510b842..26a2df8270 100644 --- a/indra/newview/llsecapi.cpp +++ b/indra/newview/llsecapi.cpp @@ -154,3 +154,10 @@ void LLCredential::authenticatorType(std::string &idType)  	}  } + +LLCertException::LLCertException(const LLSD& cert_data, const std::string& msg) +  : LLException(msg), +    mCertData(cert_data) +{ +    LL_WARNS("SECAPI") << "Certificate Error: " << msg << LL_ENDL; +} diff --git a/indra/newview/llsecapi.h b/indra/newview/llsecapi.h index c2fdbeb8e9..9c9c16d5d7 100644 --- a/indra/newview/llsecapi.h +++ b/indra/newview/llsecapi.h @@ -335,11 +335,7 @@ std::ostream& operator <<(std::ostream& s, const LLCredential& cred);  class LLCertException: public LLException  {  public: -	LLCertException(const LLSD& cert_data, const std::string& msg): LLException(msg), -        mCertData(cert_data) -	{ -		LL_WARNS("SECAPI") << "Certificate Error: " << msg << LL_ENDL; -	} +    LLCertException(const LLSD& cert_data, const std::string& msg);  	virtual ~LLCertException() throw() {}  	LLSD getCertData() const { return mCertData; }  protected: diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp index 63967fae37..e5d226a2a4 100644 --- a/indra/newview/tests/llsechandler_basic_test.cpp +++ b/indra/newview/tests/llsechandler_basic_test.cpp @@ -124,6 +124,14 @@ S32 LLMachineID::getUniqueID(unsigned char *unique_id, size_t len)  S32 LLMachineID::init() { return 1; } +LLCertException::LLCertException(const LLSD& cert_data, const std::string& msg) +    : LLException(msg), +    mCertData(cert_data) +{ +    LL_WARNS("SECAPI") << "Certificate Error: " << msg << LL_ENDL; +} + +  // -------------------------------------------------------------------------------------------  // TUT  // -------------------------------------------------------------------------------------------  | 
