livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add file name into copyright info on growl files and disable logging growl messages on Linux

Tank_Master 2012-06-30 09:08:47 -07:00
parent c855c065cb
commit f2a9376865
12 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/desktopnotifierlinux.cpp
View File

@ -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() );

3
indra/newview/desktopnotifierlinux.h
View File

@ -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

3
indra/newview/growlmanager.cpp
View File

@ -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

3
indra/newview/growlmanager.h
View File

@ -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

3
indra/newview/growlnotifier.h
View File

@ -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

3
indra/newview/growlnotifiermacosx-objc.h
View File

@ -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

3
indra/newview/growlnotifiermacosx-objc.mm
View File

@ -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

5
indra/newview/growlnotifiermacosx.cpp
View File

@ -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);
}
}

3
indra/newview/growlnotifiermacosx.h
View File

@ -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

4
indra/newview/growlnotifierwin.cpp
View File

@ -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;
}

3
indra/newview/growlnotifierwin.h
View File

@ -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:

9
indra/newview/llfeaturemanager.cpp
View File

@ -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");
}