diff options
| author | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
| commit | 1b0e3d68183fb63ac5c160bc9aa7956746f33faf (patch) | |
| tree | 260f0972726dc9d8957486f2e03773dac4a10afc /indra/newview/llfloaterreporter.cpp | |
| parent | 7772ed0cb2ebf81d4e6b1a35dcffdfe88f6c1bcc (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DRTVWR-531
Diffstat (limited to 'indra/newview/llfloaterreporter.cpp')
| -rw-r--r-- | indra/newview/llfloaterreporter.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 7bfba2a6d7..a30c73768d 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -746,9 +746,6 @@ LLSD LLFloaterReporter::gatherReport() const char* platform = "Mac"; #elif LL_LINUX const char* platform = "Lnx"; -#elif LL_SOLARIS - const char* platform = "Sol"; - const char* short_platform = "O:S"; #else const char* platform = "???"; #endif |