diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 20:38:42 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 20:38:42 +0200 |
| commit | acdca357c2a7fec60d24e1adba0dd822d7d677b9 (patch) | |
| tree | 63012291ba8379ee994e03b1abd0913600445faf /indra/newview/llwebprofile.cpp | |
| parent | 5614f6cbf6867b0114a45aadbe1d975a3d71000c (diff) | |
| parent | 03db2ddc9c27cf842c6185826617b0da0d2b87f5 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llwebprofile.cpp')
| -rw-r--r-- | indra/newview/llwebprofile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwebprofile.cpp b/indra/newview/llwebprofile.cpp index 81d4e30a7a..8dcef2c7cd 100644 --- a/indra/newview/llwebprofile.cpp +++ b/indra/newview/llwebprofile.cpp @@ -33,6 +33,7 @@ #include "llimagepng.h" #include "llsdserialize.h" +#include "llstring.h" // newview #include "llpanelprofile.h" // for getProfileURL(). FIXME: move the method to LLAvatarActions @@ -264,6 +265,5 @@ void LLWebProfile::reportImageUploadStatus(bool ok) std::string LLWebProfile::getAuthCookie() { // This is needed to test image uploads on Linux viewer built with OpenSSL 1.0.0 (0.9.8 works fine). - const char* debug_cookie = getenv("LL_SNAPSHOT_COOKIE"); - return debug_cookie ? debug_cookie : sAuthCookie; + return LLStringUtil::getenv("LL_SNAPSHOT_COOKIE", sAuthCookie); } |