3 files changed, 1 insertions, 18 deletions

diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index c468a5e..744c179 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -49,7 +49,6 @@
 #include "message.h"
 
 #include "llcommandhandler.h"
-#include "llfloaterabout.h"
 #include "llfloaterpreference.h"
 #include "llpanelnetwork.h"
 #include "llpanelaudioprefs.h"
@@ -353,7 +352,6 @@ LLFloaterPreference::LLFloaterPreference()
 
 BOOL LLFloaterPreference::postBuild()
 {
-        requires<LLButton>("About...");
         requires<LLButton>("OK");
         requires<LLButton>("Cancel");
         requires<LLButton>("Apply");
@@ -363,9 +361,6 @@ BOOL LLFloaterPreference::postBuild()
         {
                 return FALSE;
         }
-
-        mAboutBtn = getChild<LLButton>("About...");
-        mAboutBtn->setClickedCallback(onClickAbout, this);
         
         mApplyBtn = getChild<LLButton>("Apply");
         mApplyBtn->setClickedCallback(onBtnApply, this);
@@ -430,13 +425,6 @@ void LLFloaterPreference::show(void*)
 }
 
 
-// static
-void LLFloaterPreference::onClickAbout(void*)
-{
-        LLFloaterAbout::show(NULL);
-}
-
-
 // static 
 void LLFloaterPreference::onBtnOK( void* userdata )
 {
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index 894d242..6162997 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -119,12 +119,10 @@ protected:
 
         /*virtual*/ void                onClose(bool app_quitting);
 
-        LLButton*       mAboutBtn;
         LLButton        *mOKBtn;
         LLButton        *mCancelBtn;
         LLButton        *mApplyBtn;
 
-        static void             onClickAbout(void*);
         static void             onBtnOK(void*);
         static void             onBtnCancel(void*);
         static void             onBtnApply(void*);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
index 81168be..214db25 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
@@ -15,12 +15,9 @@
              left_delta="93" mouse_opaque="true" name="Apply" scale_image="true"
              width="90" />
         <button bottom="-455" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="20" label="About" label_selected="About" left="9"
-             mouse_opaque="true" name="About..." scale_image="true" width="90" />
-        <button bottom="-455" enabled="true" follows="left|bottom" font="SansSerif"
              halign="center" height="20"
              help_url="http://secondlife.com/app/help/technical/preferences.php"
-             label="Help" label_selected="Help" left_delta="93" mouse_opaque="true"
+             label="Help" label_selected="Help" left="9" mouse_opaque="true"
              name="Help" scale_image="true" width="90" />
         <tab_container bottom="-431" enabled="true" follows="left|top|right|bottom" height="410"
              left="0" mouse_opaque="false" name="pref core" tab_group="1"