Second Life viewer sources 1.19.0.0

1 files changed, 6 insertions, 7 deletions

diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 69937a0..09398fd 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -95,7 +95,8 @@ LLFloaterPreference* LLFloaterPreference::sInstance = NULL;
 class LLPreferencesHandler : public LLCommandHandler
 {
 public:
-        LLPreferencesHandler() : LLCommandHandler("preferences") { }
+        // don't allow from external browsers
+        LLPreferencesHandler() : LLCommandHandler("preferences", false) { }
         bool handle(const LLSD& tokens, const LLSD& queryMap)
         {
                 LLFloaterPreference::show(NULL);
@@ -442,8 +443,7 @@ void LLFloaterPreference::onClickAbout(void*)
 // static 
 void LLFloaterPreference::onBtnOK( void* userdata )
 {
-        //refresh splash page if we're displaying it
-        LLPanelLogin::loadLoginPage();
+        LLPanelLogin::refreshLocation( false );
 
         LLFloaterPreference *fp =(LLFloaterPreference *)userdata;
         // commit any outstanding text entry
@@ -489,8 +489,7 @@ void LLFloaterPreference::onBtnApply( void* userdata )
         }
         fp->apply();
 
-        //refresh splash page if we're displaying it
-        LLPanelLogin::loadLoginPage();
+        LLPanelLogin::refreshLocation( false );
 }