diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-09-03 00:16:35 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-09-03 00:18:26 +0300 |
| commit | b18f328c08a0af7032c24843cf1d045eea73ad33 (patch) | |
| tree | 9db8549ad49b40bc100199bc7a0004ab1a7ce235 /indra/newview/llexperiencelog.cpp | |
| parent | b12dd38c57fd9b047382e6e2d80b26f36888eb39 (diff) | |
| parent | f949415ad6d83c7c7cab282b45b1a639196b2090 (diff) | |
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
Diffstat (limited to 'indra/newview/llexperiencelog.cpp')
| -rw-r--r-- | indra/newview/llexperiencelog.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llexperiencelog.cpp b/indra/newview/llexperiencelog.cpp index ee5d561927..c441fbc09f 100644 --- a/indra/newview/llexperiencelog.cpp +++ b/indra/newview/llexperiencelog.cpp @@ -149,10 +149,6 @@ std::string LLExperienceLog::getPermissionString( const LLSD& message, const std { buf.str(entry); } - else - { - buf.str(); - } } if(buf.str().empty()) |