diff --git a/indra/newview/desktopnotifierlinux.cpp b/indra/newview/desktopnotifierlinux.cpp
index daee49a070..a619c3455d 100644
--- a/indra/newview/desktopnotifierlinux.cpp
+++ b/indra/newview/desktopnotifierlinux.cpp
@@ -1,4 +1,7 @@
 /* Copyright (c) 2010 Discrete Dreamscape All rights reserved.
+ *
+ * @file DesktopNotifierLinux.cpp
+ * @Implementation of desktop notification system (aka growl).
  *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
@@ -276,9 +279,10 @@ DesktopNotifierLinux::~DesktopNotifierLinux()
 
 void DesktopNotifierLinux::showNotification( const std::string& notification_title, const std::string& notification_message, const std::string& notification_type )
 {
-	LL_INFOS( "DesktopNotifierLinux" ) << "New notification title: " << notification_title << LL_ENDL;
-	LL_INFOS( "DesktopNotifierLinux" ) << "New notification message: " << notification_message << LL_ENDL;
-	LL_INFOS( "DesktopNotifierLinux" ) << "New notification type: " << notification_type << LL_ENDL;
+	//Dont Log messages that could contain user name info - FS:TM
+	//LL_INFOS( "DesktopNotifierLinux" ) << "New notification title: " << notification_title << LL_ENDL;
+	//LL_INFOS( "DesktopNotifierLinux" ) << "New notification message: " << notification_message << LL_ENDL;
+	//LL_INFOS( "DesktopNotifierLinux" ) << "New notification type: " << notification_type << LL_ENDL;
 
 	m_pLibNotify->mNotificationUpdate( m_pNotification,(gchar*)notification_title.c_str(), (gchar*)notification_message.c_str(), m_strIcon.c_str() );
 
diff --git a/indra/newview/desktopnotifierlinux.h b/indra/newview/desktopnotifierlinux.h
index 51ef028070..7bb241cf0e 100644
--- a/indra/newview/desktopnotifierlinux.h
+++ b/indra/newview/desktopnotifierlinux.h
@@ -1,4 +1,7 @@
 /* Copyright (c) 2010 Discrete Dreamscape All rights reserved.
+ *
+ * @file DesktopNotifierLinux.h
+ * @Implementation of desktop notification system (aka growl).
  *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
diff --git a/indra/newview/growlmanager.cpp b/indra/newview/growlmanager.cpp
index 88aa614fc0..46f1a5cab3 100644
--- a/indra/newview/growlmanager.cpp
+++ b/indra/newview/growlmanager.cpp
@@ -1,4 +1,7 @@
 /* Copyright (c) 2010 Katharine Berry All rights reserved.
+ *
+ * @file growlmanager.cpp
+ * @Implementation of desktop notification system (aka growl).
  *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
diff --git a/indra/newview/growlmanager.h b/indra/newview/growlmanager.h
index 670362140b..8933fa1afc 100644
--- a/indra/newview/growlmanager.h
+++ b/indra/newview/growlmanager.h
@@ -1,4 +1,7 @@
 /* Copyright (c) 2010 Katharine Berry All rights reserved.
+ *
+ * @file growlmanager.h
+ * @Implementation of desktop notification system (aka growl).
  *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
diff --git a/indra/newview/growlnotifier.h b/indra/newview/growlnotifier.h
index afdcd7fd37..e47510d488 100644
--- a/indra/newview/growlnotifier.h
+++ b/indra/newview/growlnotifier.h
@@ -1,4 +1,7 @@
 /* Copyright (c) 2010 Katharine Berry All rights reserved.
+ *
+ * @file growlnotifier.h
+ * @Implementation of desktop notification system (aka growl).
  *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
diff --git a/indra/newview/growlnotifiermacosx-objc.h b/indra/newview/growlnotifiermacosx-objc.h
index 3ad870dbb0..b3f0dfd968 100644
--- a/indra/newview/growlnotifiermacosx-objc.h
+++ b/indra/newview/growlnotifiermacosx-objc.h
@@ -1,4 +1,7 @@
 /* Copyright (c) 2010 Katharine Berry All rights reserved.
+ *
+ * @file growlnotifiermacosx-objc.h
+ * @Implementation of desktop notification system (aka growl).
  *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
diff --git a/indra/newview/growlnotifiermacosx-objc.mm b/indra/newview/growlnotifiermacosx-objc.mm
index 799a8d26cf..084187cca7 100644
--- a/indra/newview/growlnotifiermacosx-objc.mm
+++ b/indra/newview/growlnotifiermacosx-objc.mm
@@ -1,4 +1,7 @@
 /* Copyright (c) 2010 Katharine Berry All rights reserved.
+ *
+ * @file growlnotifiermacosx-objc.mm
+ * @Implementation of desktop notification system (aka growl).
  *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
diff --git a/indra/newview/growlnotifiermacosx.cpp b/indra/newview/growlnotifiermacosx.cpp
index 3f59f0b879..645ade1d72 100644
--- a/indra/newview/growlnotifiermacosx.cpp
+++ b/indra/newview/growlnotifiermacosx.cpp
@@ -1,4 +1,7 @@
 /* Copyright (c) 2010 Katharine Berry All rights reserved.
+ *
+ * @file growlnotifiermacosx.cpp
+ * @Implementation of desktop notification system (aka growl).
  *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
@@ -51,4 +54,4 @@ bool GrowlNotifierMacOSX::isUsable()
 void GrowlNotifierMacOSX::registerApplication(const std::string& application, const std::set<std::string>& notificationTypes)
 {
 	growlApplicationBridgeRegister(application, notificationTypes);
-}
\ No newline at end of file
+}
diff --git a/indra/newview/growlnotifiermacosx.h b/indra/newview/growlnotifiermacosx.h
index 57edc1e050..78b3cc3365 100644
--- a/indra/newview/growlnotifiermacosx.h
+++ b/indra/newview/growlnotifiermacosx.h
@@ -1,4 +1,7 @@
 /* Copyright (c) 2010 Katharine Berry All rights reserved.
+ *
+ * @file growlnotifiermacosx.h
+ * @Implementation of desktop notification system (aka growl).
  *
  * Redistribution and use in source and binary forms, with or
  * without modification, are permitted provided that the following
diff --git a/indra/newview/growlnotifierwin.cpp b/indra/newview/growlnotifierwin.cpp
index cf4bb4f9a1..0434774879 100644
--- a/indra/newview/growlnotifierwin.cpp
+++ b/indra/newview/growlnotifierwin.cpp
@@ -2,6 +2,9 @@
 *
 * Greg Hendrickson (LordGregGreg Back). All rights reserved.
 *
+* @file growlnotifierwin.cpp
+* @Implementation of desktop notification system (aka growl).
+*
 * Redistribution and use in source and binary forms, with or
 * without modification, are permitted provided that the following
 * conditions are met:
@@ -69,6 +72,5 @@ void GrowlNotifierWin::showNotification(const std::string& notification_title, c
 
 bool GrowlNotifierWin::isUsable()
 {
-	//if(growl) return true;
 	return true;
 }
diff --git a/indra/newview/growlnotifierwin.h b/indra/newview/growlnotifierwin.h
index 5727281d9a..a15b3db15b 100644
--- a/indra/newview/growlnotifierwin.h
+++ b/indra/newview/growlnotifierwin.h
@@ -2,6 +2,9 @@
 *
 * Greg Hendrickson (LordGregGreg Back). All rights reserved.
 *
+* @file growlnotifierwin.h
+* @Implementation of desktop notification system (aka growl).
+*
 * Redistribution and use in source and binary forms, with or
 * without modification, are permitted provided that the following
 * conditions are met:
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 3b4f56c2fd..206aa19ff3 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -790,12 +790,11 @@ void LLFeatureManager::applyBaseMasks()
 	{
 		maskFeatures("MapBufferRange");
 	}
-	//Enable on cards with less than 512MB ram and on all nvidia cards.
-	//Nvidia crads can compress without artifacts appering on textures.
-	//Set max to slightly lower than 512 do to some systems will report less 
-	// than true total or may have slightly less than 512 for other resions.
+	//Instead of enabeling based soley on amount of video ram, also enable based on total system ram
+	//Below show enable texture compression on systems with a video card that has 128MB or less mempory
+	// or a total system memory with 2GB or less
 	//FS:TM
-	if (!gGLManager.mIsNVIDIA && gGLManager.mVRAM > 480)
+	if (gSysMemory.getPhysicalMemoryKB() > 2100000 || gGLManager.mVRAM > 200)
 	{
 		maskFeatures("VRAMGT512");
 	}