added some settings from SLPE

2010-04-23 09:34:47 -03:00
parent fb28246485
commit e204d77d52
8 changed files with 289 additions and 15 deletions
--- a/indra/newview/llappviewerlinux.cpp
+++ b/indra/newview/llappviewerlinux.cpp
@@ -734,7 +734,7 @@ std::string LLAppViewerLinux::generateSerialNumber()
 	serial_md5[0] = 0;
 #if LL_SOLARIS
 	// TODO
-#else
+#elseif EXPERIMENTAL_SERIAL_NUM
 	// I'm going to assume this works on everything but solaris
 	std::string rootDeviceName = "";
 	std::string rootDeviceUUID = "";