From d4b888d47840d57b071dd2cf6dea492c4230e4b4 Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Tue, 8 Dec 2009 17:31:02 -0500
Subject: EXT-3133: Viewer crashes after deleting a Trash folder from the My
 Inventory accordion

Put in a quick fix so that folders can't be made reparented to their own children.

--HG--
branch : avatar-pipeline
---
 indra/newview/llinventorymodel.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llinventorymodel.cpp')

diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index fb9be1e04f..5d8a8805b5 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -192,6 +192,8 @@ void LLInventoryModel::cleanupInventory()
 BOOL LLInventoryModel::isObjectDescendentOf(const LLUUID& obj_id,
 											const LLUUID& cat_id) const
 {
+	if (obj_id == cat_id) return TRUE;
+
 	const LLInventoryObject* obj = getObject(obj_id);
 	while(obj)
 	{
-- 
cgit v1.2.3