Merge remote-tracking branch 'origin/master'

This commit is contained in:
Aleric Inglewood
2011-06-14 16:02:43 +02:00
51 changed files with 2410 additions and 1968 deletions

View File

@@ -631,7 +631,6 @@ bool LLAppViewer::init()
gSavedSettings.setS32("NumSessions", mNumSessions);
gSavedSettings.setString("HelpLastVisitedURL",gSavedSettings.getString("HelpHomeURL"));
LLHUDEffectLookAt::sDebugLookAt = gSavedSettings.getBOOL("AscentShowLookAt");
if (gSavedSettings.getBOOL("VerboseLogs"))
{