From 8e53c5bfb0e9feffa0450b362f21f56036b9b75c Mon Sep 17 00:00:00 2001
From: Ima Mechanique <ima.mechanique@secondlife.com>
Date: Wed, 26 Mar 2014 20:31:05 +0000
Subject: storm-1831 Removing the callback after first region crossing.
 Prevents repeated callbacks after highlighting has been removed for live
 script.

---
 indra/newview/llpreviewscript.cpp | 9 +++------
 indra/newview/llpreviewscript.h   | 1 +
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 4c6f4fd3ba..84e7a1650d 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -434,7 +434,7 @@ void LLScriptEdCore::updateKeywords()
 	if (mLive)
 	{
 		clearHighlights();
-		gAgent.removeRegionChangedCallback(mRegionChangedCallback);
+		mRegionChangedCallback.disconnect();
 	}
 	else
 	{
@@ -458,9 +458,7 @@ void LLScriptEdCore::processLoaded()
 
 void LLScriptEdCore::clearHighlights()
 {
-	mEditor->mKeywords.clearLoaded();
 	mEditor->clearSegments();
-	mEditor->mKeywords.clear();
 }
 
 void LLScriptEdCore::processKeywords()
@@ -1309,7 +1307,7 @@ void* LLPreviewLSL::createScriptEdPanel(void* userdata)
 								   LLPreviewLSL::onSearchReplace,
 								   self,
 								   0);
-
+	self->mScriptEd->mLive = false;
 	return self->mScriptEd;
 }
 
@@ -1324,7 +1322,7 @@ LLPreviewLSL::LLPreviewLSL(const LLSD& key )
 // virtual
 BOOL LLPreviewLSL::postBuild()
 {
-	const LLInventoryItem* item = getItem();	
+	const LLInventoryItem* item = getItem();
 
 	llassert(item);
 	if (item)
@@ -1756,7 +1754,6 @@ void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAsset
 //static 
 void* LLLiveLSLEditor::createScriptEdPanel(void* userdata)
 {
-	
 	LLLiveLSLEditor *self = (LLLiveLSLEditor*)userdata;
 
 	self->mScriptEd =  new LLScriptEdCore(
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 0841c8188b..dc4f828cf1 100755
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -162,6 +162,7 @@ private:
 	LLScriptEdContainer* mContainer; // parent view
 
 public:
+	boost::signals2::connection mFileFetchedCallback;
 	boost::signals2::connection mRegionChangedCallback;
 
 };
-- 
cgit v1.2.3