diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-20 20:38:05 +0000 |
| commit | d373dcc7cbed5fdea72c6b71a5594e4e85549b43 (patch) | |
| tree | 140e20f48db5dc4d7842f05ef2c24ef9e6fc3238 /indra/llvfs/lldir.cpp | |
| parent | c78f99b0b3b4b9ac99a69b63315e821d89a89a3b (diff) | |
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
Diffstat (limited to 'indra/llvfs/lldir.cpp')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index d8d77e6a23..94c1b5de24 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -25,6 +25,9 @@ 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; |