From 1502ef2661490ed3b08cfc32292c339f0dbc8190 Mon Sep 17 00:00:00 2001
From: Lirusaito <Inusaito@gmail.com>
Date: Sat, 26 Apr 2014 10:19:04 -0400
Subject: [PATCH] Fix for an internal crash, could only happen if settings were
 copied into install improperly, but better safe than sorry.

---
 indra/newview/lldroptarget.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/indra/newview/lldroptarget.cpp b/indra/newview/lldroptarget.cpp
index 22b555228..9e7cc377e 100644
--- a/indra/newview/lldroptarget.cpp
+++ b/indra/newview/lldroptarget.cpp
@@ -145,6 +145,11 @@ void LLDropTarget::setControlName(const std::string& control_name, LLView* conte
 	else
 	{
 		mControl = gSavedPerAccountSettings.getControl(control_name);
+		if (!mControl)
+		{
+			llerrs << "Could not find control \"" << control_name << "\" in gSavedPerAccountSettings" << llendl;
+			return; // Though this should never happen.
+		}
 		const LLUUID id(mControl->getValue().asString());
 		if (id.isNull())
 			text = LLTrans::getString("CurrentlyNotSet");