diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:04:32 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:04:32 +0300 |
| commit | a4595bdaf2f24b8c08ae8c1e7a4b3dc9e9c2ef4b (patch) | |
| tree | 0679478dcf2d3a77c52ec436fe5e724bf7542c85 /indra/llvfs/lldir.cpp | |
| parent | b6ac642db2213cf4207dddc47a1fe1490de0cc6e (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
# doc/contributions.txt
Diffstat (limited to 'indra/llvfs/lldir.cpp')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 18a1bcb1be..7a30cd4cea 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/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; |