Second Life viewer sources 1.19.0.0

1 files changed, 8 insertions, 2 deletions

diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 931b4cd..ce5a7e6 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.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,
@@ -134,6 +134,12 @@ LLFloaterDirectory::LLFloaterDirectory(const std::string& name)
 LLFloaterDirectory::~LLFloaterDirectory()
 {
         sInstance = NULL;
+
+        //Note: this function is defined in the class LLFloater.
+        //however, it causes crash if this line is postponed to ~LLFloater(). 
+        //because it uses some pointers deleted below. That is, those pointers are used again after deleting.
+        setMinimized( FALSE );
+
         delete mPanelAvatarp; mPanelAvatarp = NULL;
         delete mPanelEventp; mPanelEventp = NULL;
         delete mPanelGroupp; mPanelGroupp = NULL;