From e54f8f47caea93c5a758ed5379b0e8de9a3f538f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 13 Feb 2016 20:15:02 +0100
Subject: [PATCH 1/7] FIRE-17252: Rename "Open Crash Logs" to "Open Viewer
 Logs" in Preferences -> Network & Files -> Directories

---
 .../newview/skins/default/xui/de/panel_preferences_setup.xml  | 2 +-
 .../newview/skins/default/xui/en/panel_preferences_setup.xml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
index 34e7a9d5bb..96a1e174b4 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -68,7 +68,7 @@
 			<button label="Öffnen" label_selected="Öffnen" name="open_log_path_button-panelsetup"/>
 			<button label="Setzen" label_selected="Setzen" name="log_path_button-panelsetup" width="45"/>
 			<button label="Zurücksetzen" label_selected="Zurücksetzen" name="reset_logpath" width="82"/>
-			<button label="Öffne Crash-Protokolle" label_selected="Öffne Crash-Protokolle" name="browse_crashlogs" width="140"/>
+			<button label="Öffne Viewer-Protokolle" label_selected="Öffne Viewer-Protokolle" name="browse_crashlogs" width="140"/>
 			<button label="Öffne Ordner mit Einstellungen" label_selected="Öffne Ordner mit Einstellungen" name="browse_settingsdir" width="190"/>
 		</panel>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 8e6a27a650..3afaea60c3 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -677,8 +677,8 @@
 		 enabled="true"
 		 follows="left|top"
 		 height="23"
-		 label="Open Crash Logs"
-		 label_selected="Open Crash Logs"
+		 label="Open Viewer Logs"
+		 label_selected="Open Viewer Logs"
 		 layout="topleft"
 		 left="20"
 		 name="browse_crashlogs"

From 79dcb1ca11ce3a31984b46217a53697206883600 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 13 Feb 2016 20:42:13 +0100
Subject: [PATCH 2/7] STORM-2124 - Update fonts.xml with default CJK font
 collections in OS X 10.11 and Windows 10; by Cinder Roxley, with
 modifications for Firestorm

---
 doc/contributions.txt                          | 1 +
 indra/newview/fonts/fonts.xml                  | 1 +
 indra/newview/fonts/fonts_deja_vu_all_caps.xml | 2 ++
 indra/newview/fonts/fonts_droid.xml            | 2 ++
 indra/newview/fonts/fonts_dyslexia.xml         | 2 ++
 indra/newview/fonts/fonts_liberation.xml       | 2 ++
 indra/newview/fonts/fonts_mobi.xml             | 2 ++
 indra/newview/fonts/fonts_roboto.xml           | 2 ++
 indra/newview/fonts/fonts_ubuntu.xml           | 2 ++
 9 files changed, 16 insertions(+)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 6e355816ae..89131eb6f0 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -332,6 +332,7 @@ Cinder Roxley
     STORM-2053
     STORM-2105
     STORM-2113
+    STORM-2124
 Clara Young
 Coaldust Numbers
     VWR-1095
diff --git a/indra/newview/fonts/fonts.xml b/indra/newview/fonts/fonts.xml
index e90a14c1f7..e236111455 100644
--- a/indra/newview/fonts/fonts.xml
+++ b/indra/newview/fonts/fonts.xml
@@ -4,6 +4,7 @@
   <font name="default" comment="default font files (global fallbacks)">
     <file>DejaVuSans.ttf</file>
     <os name="Windows">
+      <file>YuGothR.ttc</file>
       <file>MSGOTHIC.TTC</file>
       <file>gulim.ttc</file>
       <file>simhei.ttf</file>
diff --git a/indra/newview/fonts/fonts_deja_vu_all_caps.xml b/indra/newview/fonts/fonts_deja_vu_all_caps.xml
index 4f7ffb2a37..04a6f1252d 100644
--- a/indra/newview/fonts/fonts_deja_vu_all_caps.xml
+++ b/indra/newview/fonts/fonts_deja_vu_all_caps.xml
@@ -4,6 +4,7 @@
   <font name="default" comment="default font files (global fallbacks)">
     <file>DejaVuSansAllCaps.ttf</file>
     <os name="Windows">
+      <file>YuGothR.ttc</file>
       <file>MSGOTHIC.TTC</file>
       <file>gulim.ttc</file>
       <file>simhei.ttf</file>
@@ -11,6 +12,7 @@
       <file>seguisym.ttf</file>
     </os>
     <os name="Mac">
+      <file>ヒラギノ角ゴシック W3.ttc</file>
       <file>ヒラギノ角ゴ Pro W3.otf</file>
       <file>ヒラギノ角ゴ ProN W3.otf</file>
       <file>AppleSDGothicNeo-Regular.otf</file>
diff --git a/indra/newview/fonts/fonts_droid.xml b/indra/newview/fonts/fonts_droid.xml
index a42d65862c..9b21ce572e 100644
--- a/indra/newview/fonts/fonts_droid.xml
+++ b/indra/newview/fonts/fonts_droid.xml
@@ -4,6 +4,7 @@
   <font name="default" comment="default font files (global fallbacks)">
     <file>DroidSans.ttf</file>
     <os name="Windows">
+      <file>YuGothR.ttc</file>
       <file>MSGOTHIC.TTC</file>
       <file>gulim.ttc</file>
       <file>simhei.ttf</file>
@@ -11,6 +12,7 @@
       <file>seguisym.ttf</file>
     </os>
     <os name="Mac">
+      <file>ヒラギノ角ゴシック W3.ttc</file>
       <file>ヒラギノ角ゴ Pro W3.otf</file>
       <file>ヒラギノ角ゴ ProN W3.otf</file>
       <file>AppleSDGothicNeo-Regular.otf</file>
diff --git a/indra/newview/fonts/fonts_dyslexia.xml b/indra/newview/fonts/fonts_dyslexia.xml
index bf53b77184..96e2e145e3 100644
--- a/indra/newview/fonts/fonts_dyslexia.xml
+++ b/indra/newview/fonts/fonts_dyslexia.xml
@@ -4,6 +4,7 @@
   <font name="default" comment="default font files (global fallbacks)">
     <file>MobiSans.ttf</file>
     <os name="Windows">
+      <file>YuGothR.ttc</file>
       <file>MSGOTHIC.TTC</file>
       <file>gulim.ttc</file>
       <file>simhei.ttf</file>
@@ -11,6 +12,7 @@
       <file>seguisym.ttf</file>
     </os>
     <os name="Mac">
+      <file>ヒラギノ角ゴシック W3.ttc</file>
       <file>ヒラギノ角ゴ Pro W3.otf</file>
       <file>ヒラギノ角ゴ ProN W3.otf</file>
       <file>AppleSDGothicNeo-Regular.otf</file>
diff --git a/indra/newview/fonts/fonts_liberation.xml b/indra/newview/fonts/fonts_liberation.xml
index 8e9e917f7c..886b2d10da 100644
--- a/indra/newview/fonts/fonts_liberation.xml
+++ b/indra/newview/fonts/fonts_liberation.xml
@@ -4,6 +4,7 @@
   <font name="default" comment="default font files (global fallbacks)">
     <file>LiberationSans-Regular.ttf</file>
     <os name="Windows">
+      <file>YuGothR.ttc</file>
       <file>MSGOTHIC.TTC</file>
       <file>gulim.ttc</file>
       <file>simhei.ttf</file>
@@ -11,6 +12,7 @@
       <file>seguisym.ttf</file>
     </os>
     <os name="Mac">
+      <file>ヒラギノ角ゴシック W3.ttc</file>
       <file>ヒラギノ角ゴ Pro W3.otf</file>
       <file>ヒラギノ角ゴ ProN W3.otf</file>
       <file>AppleSDGothicNeo-Regular.otf</file>
diff --git a/indra/newview/fonts/fonts_mobi.xml b/indra/newview/fonts/fonts_mobi.xml
index a9f30f168f..d16919e512 100644
--- a/indra/newview/fonts/fonts_mobi.xml
+++ b/indra/newview/fonts/fonts_mobi.xml
@@ -4,6 +4,7 @@
   <font name="default" comment="default font files (global fallbacks)">
     <file>MobiSans.ttf</file>
     <os name="Windows">
+      <file>YuGothR.ttc</file>
       <file>MSGOTHIC.TTC</file>
       <file>gulim.ttc</file>
       <file>simhei.ttf</file>
@@ -11,6 +12,7 @@
       <file>seguisym.ttf</file>
     </os>
     <os name="Mac">
+      <file>ヒラギノ角ゴシック W3.ttc</file>
       <file>ヒラギノ角ゴ Pro W3.otf</file>
       <file>ヒラギノ角ゴ ProN W3.otf</file>
       <file>AppleSDGothicNeo-Regular.otf</file>
diff --git a/indra/newview/fonts/fonts_roboto.xml b/indra/newview/fonts/fonts_roboto.xml
index fc16c83b1d..2a3bdd1bf0 100644
--- a/indra/newview/fonts/fonts_roboto.xml
+++ b/indra/newview/fonts/fonts_roboto.xml
@@ -4,6 +4,7 @@
   <font name="default" comment="default font files (global fallbacks)">
     <file>DroidSans.ttf</file>
     <os name="Windows">
+      <file>YuGothR.ttc</file>
       <file>MSGOTHIC.TTC</file>
       <file>gulim.ttc</file>
       <file>simhei.ttf</file>
@@ -11,6 +12,7 @@
       <file>seguisym.ttf</file>
     </os>
     <os name="Mac">
+      <file>ヒラギノ角ゴシック W3.ttc</file>
       <file>ヒラギノ角ゴ Pro W3.otf</file>
       <file>ヒラギノ角ゴ ProN W3.otf</file>
       <file>AppleSDGothicNeo-Regular.otf</file>
diff --git a/indra/newview/fonts/fonts_ubuntu.xml b/indra/newview/fonts/fonts_ubuntu.xml
index 92dc2e06d3..73c54491a3 100644
--- a/indra/newview/fonts/fonts_ubuntu.xml
+++ b/indra/newview/fonts/fonts_ubuntu.xml
@@ -4,6 +4,7 @@
   <font name="default" comment="default font files (global fallbacks)">
     <file>Ubuntu-R.ttf</file>
     <os name="Windows">
+      <file>YuGothR.ttc</file>
       <file>MSGOTHIC.TTC</file>
       <file>gulim.ttc</file>
       <file>simhei.ttf</file>
@@ -11,6 +12,7 @@
       <file>seguisym.ttf</file>
     </os>
     <os name="Mac">
+      <file>ヒラギノ角ゴシック W3.ttc</file>
       <file>ヒラギノ角ゴ Pro W3.otf</file>
       <file>ヒラギノ角ゴ ProN W3.otf</file>
       <file>AppleSDGothicNeo-Regular.otf</file>

From 8b743a25220a6643a24c5dab931c31c2da4f27e0 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Sat, 13 Feb 2016 21:58:50 +0100
Subject: [PATCH 3/7] Try to detect if some AV messes up http pipelining, if it
 happens, switch http pipelining off.

---
 indra/llcorehttp/_httplibcurl.cpp   | 54 +++++++++++++++++++++++++++++
 indra/llcorehttp/_httpoprequest.cpp |  9 ++++-
 indra/llcorehttp/_httpoprequest.h   |  2 +-
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp
index 6d104458ef..854d048897 100755
--- a/indra/llcorehttp/_httplibcurl.cpp
+++ b/indra/llcorehttp/_httplibcurl.cpp
@@ -358,6 +358,60 @@ bool HttpLibcurl::completeRequest(CURLM * multi_handle, CURL * handle, CURLcode
 		}
 	}
 
+	// <FS:NS> See if the requested URL matches a X-LL-URL header (if present) and the requested range.
+	// If not, we assume http pipelining havng gone out of sync. If yes, yield a 503 status and switch
+	// pipelining off.
+	bool bFailed = false;
+	if( op->mXLLURL.size() )
+	{
+		std::string strURI = op->mReqURL;
+		int i = strURI.find( "://" );
+		if( i > 0 )
+			i = strURI.find( "/", i+3 );
+
+		if( i > 0 )
+			strURI = strURI.substr( i );
+
+		if( strURI != op->mXLLURL )
+		{
+			LL_WARNS() << "HTTP pipelining out of sync! Asked for: " << strURI << " got " << op->mXLLURL << LL_ENDL;
+			op->mStatus = HttpStatus(HTTP_SERVICE_UNAVAILABLE);
+			bFailed = true;
+		}
+	}
+	if ( !bFailed && (op->mReqOffset || op->mReqLength) )
+	{
+		if( op->mReqOffset != op->mReplyOffset || ( op->mReqLength && op->mReqLength < op->mReplyLength ) )
+		{
+			std::stringstream strm;
+			strm << "HTTP pipelining possibly out of sync, request wanted: " << op->mReqOffset << "-";
+			if( op->mReqLength )
+				strm << op->mReqLength + op->mReqLength -1;
+			strm << " got: " << op->mReplyOffset << "-" << op->mReplyOffset+op->mReplyLength-1;
+			strm << " url: " << op->mReqURL;
+			LL_WARNS() << strm.str() << LL_ENDL;
+			op->mStatus = HttpStatus(HTTP_SERVICE_UNAVAILABLE);
+			bFailed = true;
+		}
+	}
+	if( bFailed )
+	{
+		HttpPolicy & policy(mService->getPolicy());
+		for( int i = 0; i < mPolicyCount; ++ i )
+		{
+			HttpPolicyClass & options(policy.getClassOptions(i));
+			long lVal;
+			
+			if( options.get(  LLCore::HttpRequest::PO_PIPELINING_DEPTH, &lVal ) && lVal )
+			{
+				options.set( LLCore::HttpRequest::PO_PIPELINING_DEPTH, 0 );
+				mDirtyPolicy[ i ] = true;
+				policyUpdated( i );
+			}
+		}
+	}
+	// /</FS:ND>
+
 	// Detach from multi and recycle handle
 	curl_multi_remove_handle(multi_handle, handle);
 	mHandleCache.freeHandle(op->mCurlHandle);
diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp
index b9632a7921..42aff3a76a 100755
--- a/indra/llcorehttp/_httpoprequest.cpp
+++ b/indra/llcorehttp/_httpoprequest.cpp
@@ -810,7 +810,14 @@ size_t HttpOpRequest::headerCallback(void * data, size_t size, size_t nmemb, voi
 		// No use continuing
 		return hdr_size;
 	}
-	
+
+	// <FS:ND> To detect pipelining going out of sync, save a x-ll-url header and later compare it with the requested URL.
+	// We do not bail here already, but rather postpone it until the request is finised, then yield a 503 status
+	// (request will be retried) and turn pipelining off.
+	if( value && std::string( "x-ll-url" ) == name )
+		op->mXLLURL = value;
+	// </FS:ND>
+
 	// Save header if caller wants them in the response
 	if (is_header && op->mProcFlags & PF_SAVE_HEADERS)
 	{
diff --git a/indra/llcorehttp/_httpoprequest.h b/indra/llcorehttp/_httpoprequest.h
index 2f628b5aba..45248531be 100755
--- a/indra/llcorehttp/_httpoprequest.h
+++ b/indra/llcorehttp/_httpoprequest.h
@@ -187,7 +187,7 @@ public:
 	HttpHeaders *		mReplyHeaders;
 	std::string			mReplyConType;
 	int					mReplyRetryAfter;
-
+	std::string mXLLURL; // <FS:ND/> If we get a x-ll-url header, save it here, even if mReplyHeaders is not filled.
 	// Policy data
 	int					mPolicyRetries;
 	int					mPolicy503Retries;

From aa015a0b9086791a54ded3b05e07385e118a7c5f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 14 Feb 2016 17:11:26 +0100
Subject: [PATCH 4/7] Crash fix when trying to open a group profile while being
 disconnected

---
 indra/newview/llpanelgroupexperiences.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/indra/newview/llpanelgroupexperiences.cpp b/indra/newview/llpanelgroupexperiences.cpp
index 76b68122fb..fb3a97318e 100644
--- a/indra/newview/llpanelgroupexperiences.cpp
+++ b/indra/newview/llpanelgroupexperiences.cpp
@@ -38,6 +38,8 @@
 #include "llpanelexperiences.h"
 #include "llsd.h"
 
+#include "llvoavatarself.h"
+
 
 static LLPanelInjector<LLPanelGroupExperiences> t_panel_group_experiences("panel_group_experiences");
 
@@ -101,6 +103,13 @@ void LLPanelGroupExperiences::activate()
 		return;
 	}
 
+	// <FS:Ansariel> Crash fix
+	if (!isAgentAvatarValid())
+	{
+		return;
+	}
+	// </FS:Ansariel>
+
 	// search for experiences owned by the current group
 	std::string url = gAgent.getRegion()->getCapability("GroupExperiences"); 
 	if (!url.empty())

From aa5c2e2e08de39fb6db27ecba359f062510e5adb Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 14 Feb 2016 17:57:24 +0100
Subject: [PATCH 5/7] Fix more crashes when viewer is disconnected

---
 indra/newview/animationexplorer.cpp   | 11 ++++++-----
 indra/newview/llfloaterland.cpp       |  8 ++++++--
 indra/newview/llfloaterregioninfo.cpp | 21 +++++++++++++++++----
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/indra/newview/animationexplorer.cpp b/indra/newview/animationexplorer.cpp
index a2fcc94232..072a8ff7b1 100644
--- a/indra/newview/animationexplorer.cpp
+++ b/indra/newview/animationexplorer.cpp
@@ -160,11 +160,12 @@ BOOL AnimationExplorer::postBuild()
 	mPreviewCtrl = findChild<LLView>("animation_preview");
 	if (mPreviewCtrl)
 	{
-		mAnimationPreview = new LLPreviewAnimation(
-			mPreviewCtrl->getRect().getWidth(),mPreviewCtrl->getRect().getHeight()
-		);
-		mAnimationPreview->setZoom(2.0f);
-		startMotion(LLUUID::null);
+		if (isAgentAvatarValid())
+		{
+			mAnimationPreview = new LLPreviewAnimation(mPreviewCtrl->getRect().getWidth(), mPreviewCtrl->getRect().getHeight());
+			mAnimationPreview->setZoom(2.0f);
+			startMotion(LLUUID::null);
+		}
 	}
 	else
 	{
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index c5d2475e1f..361008973a 100755
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -257,7 +257,8 @@ void LLFloaterLand::onOpen(const LLSD& key)
 	mParcel = LLViewerParcelMgr::getInstance()->getFloatingParcelSelection();
 
 	// <FS:Ansariel> FIRE-17280: Requesting Experience access allow & block list breaks OpenSim
-	if (!LLViewerParcelMgr::getInstance()->getSelectionRegion()->isCapabilityAvailable("RegionExperiences"))
+	LLViewerRegion* selected_region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
+	if (!selected_region || !selected_region->isCapabilityAvailable("RegionExperiences"))
 	{
 		mTabLand->removeTabPanel(mTabLand->getPanelByName("land_experiences_panel"));
 	}
@@ -499,7 +500,10 @@ BOOL LLPanelLandGeneral::postBuild()
 	// note: on region change this will not be re checked, should not matter on Agni as
 	// 99% of the time all regions will return the same caps. In case of an erroneous setting
 	// to enabled the floater will just throw an error when trying to get it's cap
-	std::string url = gAgent.getRegion()->getCapability("LandResources");
+	// <FS:Ansariel> Crash fix
+	//std::string url = gAgent.getRegion()->getCapability("LandResources");
+	std::string url = gAgent.getRegion() ? gAgent.getRegion()->getCapability("LandResources") : "";
+	// </FS:Ansariel>
 	if (!url.empty())
 	{
 		mBtnScriptLimits = getChild<LLButton>("Scripts...");
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 7d59af2383..4cb1fbb5b3 100755
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -225,7 +225,7 @@ BOOL LLFloaterRegionInfo::postBuild()
 
 // <FS:CR> Aurora Sim - Region Settings Console
 	// We only use this panel on Aurora-based sims
-	std::string url = gAgent.getRegion()->getCapability("DispatchOpenRegionSettings");
+	std::string url = gAgent.getRegion() ? gAgent.getRegion()->getCapability("DispatchOpenRegionSettings") : "";
 	if (!url.empty())
 	{
 		panel = new LLPanelRegionOpenSettingsInfo;
@@ -250,7 +250,10 @@ BOOL LLFloaterRegionInfo::postBuild()
 	panel->buildFromFile("panel_region_debug.xml");
 	mTab->addTabPanel(panel);
 
-	if(!gAgent.getRegion()->getCapability("RegionExperiences").empty())
+	// <FS:Ansariel> Crash fix
+	//if(!gAgent.getRegion()->getCapability("RegionExperiences").empty())
+	if (gAgent.getRegion() && !gAgent.getRegion()->getCapability("RegionExperiences").empty())
+	// </FS:Ansariel>
 	{
 		panel = new LLPanelRegionExperiences;
 		mInfoPanels.push_back(panel);
@@ -876,7 +879,10 @@ protected:
 
 void LLFloaterRegionInfo::requestMeshRezInfo()
 {
-	std::string sim_console_url = gAgent.getRegion()->getCapability("SimConsoleAsync");
+	// <FS:Ansariel> Crash fix
+	//std::string sim_console_url = gAgent.getRegion()->getCapability("SimConsoleAsync");
+	std::string sim_console_url = gAgent.getRegion() ? gAgent.getRegion()->getCapability("SimConsoleAsync") : "";
+	// </FS:Ansariel>
 
 	if (!sim_console_url.empty())
 	{
@@ -904,6 +910,13 @@ BOOL LLPanelRegionGeneralInfo::sendUpdate()
 {
 	LL_INFOS() << "LLPanelRegionGeneralInfo::sendUpdate()" << LL_ENDL;
 
+	// <FS:Ansariel> Crash fix
+	if (!gAgent.getRegion())
+	{
+		return FALSE;
+	}
+	// </FS:Ansariel>
+
 	// First try using a Cap.  If that fails use the old method.
 	LLSD body;
 	std::string url = gAgent.getRegion()->getCapability("DispatchRegionInfo");
@@ -1052,7 +1065,7 @@ void LLPanelRegionOpenSettingsInfo::onClickOrs(void* userdata)
 	LL_INFOS() << "LLPanelRegionOpenSettingsInfo::onClickOrs()" << LL_ENDL;
 
 	LLSD body;
-	std::string url = gAgent.getRegion()->getCapability("DispatchOpenRegionSettings");
+	std::string url = gAgent.getRegion() ? gAgent.getRegion()->getCapability("DispatchOpenRegionSettings") : "";
 	if (!url.empty())
 	{
 		body["draw_distance"] = (LLSD::Integer)self->childGetValue("draw_distance");

From 137269f5b0f198379c19948055a9a0975b86142f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 14 Feb 2016 18:17:11 +0100
Subject: [PATCH 6/7] Another shot at viewer crash on disconnect in
 LLFloaterView::restoreAll()

---
 indra/llui/llfloater.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index fe44c40c91..316c092e0d 100755
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2481,11 +2481,15 @@ void LLFloaterView::restoreAll()
 	// make sure all subwindows aren't minimized
 	for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
 	{
-		LLFloater* floaterp = (LLFloater*)*child_it;
-		if (floaterp) //<FS:KC> Possible fix for crash on disconnect
+		// <FS:Ansariel> Possible fix for crash on disconnect
+		//LLFloater* floaterp = (LLFloater*)*child_it;
+		//floaterp->setMinimized(FALSE);
+		LLFloater* floaterp = dynamic_cast<LLFloater*>(*child_it);
+		if (floaterp)
 		{
 			floaterp->setMinimized(FALSE);
 		}
+		// </FS:Ansariel>
 	}
 
 	// *FIX: make sure dependents are restored

From 1b51f2bdf238820bd5d2ced530d55ace13b372d7 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 15 Feb 2016 09:20:33 +0100
Subject: [PATCH 7/7] Crash fix in LLGroupMgr::notifyObservers(), found by
 Kitty Barnett

---
 indra/newview/llnotificationlistitem.cpp | 8 ++++++--
 indra/newview/llnotificationlistitem.h   | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llnotificationlistitem.cpp b/indra/newview/llnotificationlistitem.cpp
index 73c8827b4d..f45830bae1 100644
--- a/indra/newview/llnotificationlistitem.cpp
+++ b/indra/newview/llnotificationlistitem.cpp
@@ -393,7 +393,10 @@ LLGroupNoticeNotificationListItem::LLGroupNoticeNotificationListItem(const Param
     buildFromFile("panel_notification_list_item.xml");
 }
 
-LLGroupNoticeNotificationListItem::~LLGroupNoticeNotificationListItem()
+// <FS:Ansariel> Crash fix in LLGroupMgr::notifyObservers()
+//LLGroupNoticeNotificationListItem::~LLGroupNoticeNotificationListItem()
+LLGroupNotificationListItem::~LLGroupNotificationListItem()
+// </FS:Ansariel>
 {
 	LLGroupMgr::getInstance()->removeObserver(this);
 }
@@ -584,7 +587,8 @@ void LLGroupNoticeNotificationListItem::close()
         mInventoryOffer->forceResponse(IOR_DECLINE);
         mInventoryOffer = NULL;
     }
-    LLGroupMgr::getInstance()->removeObserver(this);
+    // <FS:Ansariel> Crash fix in LLGroupMgr::notifyObservers()
+    //LLGroupMgr::getInstance()->removeObserver(this);
 }
 
 void LLGroupNoticeNotificationListItem::onClickAttachment()
diff --git a/indra/newview/llnotificationlistitem.h b/indra/newview/llnotificationlistitem.h
index 881fd3a8c1..2343e09a29 100644
--- a/indra/newview/llnotificationlistitem.h
+++ b/indra/newview/llnotificationlistitem.h
@@ -140,6 +140,7 @@ class LLGroupNotificationListItem
     : public LLNotificationListItem, public LLGroupMgrObserver
 {
 public:
+	virtual ~LLGroupNotificationListItem(); // <FS:Ansariel> Crash fix in LLGroupMgr::notifyObservers()
     virtual BOOL postBuild();
 
     void setGroupId(const LLUUID& value);
@@ -201,7 +202,7 @@ class LLGroupNoticeNotificationListItem
     : public LLGroupNotificationListItem
 {
 public:
-	~LLGroupNoticeNotificationListItem();
+	//~LLGroupNoticeNotificationListItem(); // <FS:Ansariel> Crash fix in LLGroupMgr::notifyObservers()
     static std::set<std::string> getTypes();
     virtual BOOL postBuild();