Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

1 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index be1c254..37e9c54 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -202,7 +202,9 @@ LLFloaterAbout::LLFloaterAbout()
         support.append("\n");
 
         support.append("Audio Driver Version: ");
-        support.append( gAudiop ? gAudiop->getDriverName(true) : "(none)" );
+        bool want_fullname = true;
+        support.append( gAudiop ? gAudiop->getDriverName(want_fullname) : "(none)" );
+
         support.append("\n");
 
         LLMediaManager *mgr = LLMediaManager::getInstance();