merge release@83343 skinning-1-merge@83714 -> release

QAR-424

1 files changed, 2 insertions, 3 deletions

diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 55b006908f..d7d96e2037 100644
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -52,12 +52,11 @@ class LLMenuBarGL;
 class LLFloaterScriptSearch;
 class LLKeywordToken;
 
-// Inner, implementation class.  LLPreviewScript and LLLiveScriptEditor each own one of these.
+// Inner, implementation class.  LLPreviewScript and LLLiveLSLEditor each own one of these.
 class LLScriptEdCore : public LLPanel
 {
 	friend class LLPreviewScript;
 	friend class LLPreviewLSL;
-	friend class LLLiveScriptEditor;
 	friend class LLLiveLSLEditor;
 	friend class LLFloaterScriptSearch;
 
@@ -118,7 +117,7 @@ public:
 
 	void selectFirstError();
 
-	virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+	virtual BOOL handleKeyHere(KEY key, MASK mask);
 
 protected:
 	void deleteBridges();