From 5e9e67cb2d1d3dfc82dfe96103270b2341991ddd Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 16 Mar 2007 20:39:40 +0000
Subject: merge -r 59028:59178 maintenance -> release.

---
 indra/newview/llpreviewscript.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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

diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index a7d29a6591..eb86934a54 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -169,6 +169,18 @@ LLFloaterScriptSearch::LLFloaterScriptSearch(std::string title, LLRect rect, LLS
 	sInstance = this;
 
 	childSetFocus("search_text", TRUE);
+
+	// find floater in which script panel is embedded
+	LLView* viewp = (LLView*)editor_core;
+	while(viewp)
+	{
+		if (viewp->getWidgetType() == WIDGET_TYPE_FLOATER)
+		{
+			((LLFloater*)viewp)->addDependentFloater(this);
+			break;
+		}
+		viewp = viewp->getParent();
+	}
 }
 
 //static 
-- 
cgit v1.2.3