From d373dcc7cbed5fdea72c6b71a5594e4e85549b43 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 20 Jul 2007 20:38:05 +0000
Subject: 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

---
 indra/llvfs/lldir.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/llvfs/lldir.cpp')

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;
-- 
cgit v1.2.3