diff options
author | Callum Prentice <callum@lindenlab.com> | 2021-06-07 18:55:00 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2021-06-07 18:55:00 -0700 |
commit | ad9ed0a94dfd37878b35b70e0a365017a1e548bf (patch) | |
tree | a86bee1eba9cd8c40c1408abf067e3f8f673a33f /indra/llfilesystem/lldir.cpp | |
parent | ac8640d338997020ca0650001ff004e1103ac5cb (diff) | |
parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) |
Merge with tip of Master after Viewer release
Diffstat (limited to 'indra/llfilesystem/lldir.cpp')
-rw-r--r-- | indra/llfilesystem/lldir.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp index 10fbc06c61..9e9abbadff 100644 --- a/indra/llfilesystem/lldir.cpp +++ b/indra/llfilesystem/lldir.cpp @@ -61,9 +61,6 @@ LLDir_Win32 gDirUtil; #elif LL_DARWIN #include "lldir_mac.h" LLDir_Mac gDirUtil; -#elif LL_SOLARIS -#include "lldir_solaris.h" -LLDir_Solaris gDirUtil; #else #include "lldir_linux.h" LLDir_Linux gDirUtil; |