1 files changed, 22 insertions, 2 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 4f888f1f5a..d21afab050 100644
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -81,8 +81,13 @@ using namespace llsd;
 #   include <sys/sysinfo.h>
 #   include <stdexcept>
 const char MEMINFO_FILE[] = "/proc/meminfo";
+#ifdef __GNU__
 #   include <gnu/libc-version.h>
 #endif
+#elif __FreeBSD__
+#	include <sys/sysctl.h>
+#	include <sys/utsname.h>
+#endif
 
 LLCPUInfo gSysCPU;
 
@@ -345,6 +350,8 @@ LLOSInfo::LLOSInfo() :
         mOSString = mOSStringSimple;
     }
 
+#ifdef __GNU__
+
     const char OS_VERSION_MATCH_EXPRESSION[] = "([0-9]+)\\.([0-9]+)(\\.([0-9]+))?";
     boost::regex os_version_parse(OS_VERSION_MATCH_EXPRESSION);
     boost::smatch matched;
@@ -408,6 +415,8 @@ LLOSInfo::LLOSInfo() :
         LL_WARNS("AppInit") << "glibc version '" << glibc_version << "' cannot be parsed to three numbers; using all zeros" << LL_ENDL;
     }
 
+#endif // __GNU__
+
 #else
 
     struct utsname un;
@@ -434,6 +443,13 @@ LLOSInfo::LLOSInfo() :
             if (simple.length() > 0)
                 mOSStringSimple = simple;
         }
+        else if (ostype == "FreeBSD")
+        {
+            // Only care about major and minor FreeBSD versions, truncate at first '-'
+            std::string simple = mOSStringSimple.substr(0, mOSStringSimple.find_first_of("-", 0));
+            if (simple.length() > 0)
+                mOSStringSimple = simple;
+        }
     }
     else
     {
@@ -759,13 +775,17 @@ static U32Kilobytes LLMemoryAdjustKBResult(U32Kilobytes inKB)
 }
 #endif
 
-#if LL_DARWIN
+#if LL_DARWIN || __FreeBSD__
 // static
 U32Kilobytes LLMemoryInfo::getHardwareMemSize()
 {
     // This might work on Linux as well.  Someone check...
     uint64_t phys = 0;
+#if LL_DARWIN
     int mib[2] = { CTL_HW, HW_MEMSIZE };
+#else
+    int mib[2] = { CTL_HW, HW_PHYSMEM };
+#endif
 
     size_t len = sizeof(phys);
     sysctl(mib, 2, &phys, &len, NULL, 0);
@@ -779,7 +799,7 @@ U32Kilobytes LLMemoryInfo::getPhysicalMemoryKB() const
 #if LL_WINDOWS
     return LLMemoryAdjustKBResult(U32Kilobytes(mStatsMap["Total Physical KB"].asInteger()));
 
-#elif LL_DARWIN
+#elif LL_DARWIN || __FreeBSD__
     return getHardwareMemSize();
 
 #elif LL_LINUX