From 4af78ca09ebb8115bd70e0c3cc8f7f2cd3a0c9ed Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Thu, 9 May 2019 15:19:37 +0300
Subject: SL-11121 FIXED Viewer crashes after clicking the 'Edit' button in the
 notecard floater

---
 indra/newview/llpreviewnotecard.cpp                    | 3 ++-
 indra/newview/llpreviewscript.cpp                      | 2 +-
 indra/newview/skins/default/xui/en/panel_script_ed.xml | 4 ----
 indra/newview/skins/default/xui/en/strings.xml         | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index f012d99adf..1533a27469 100644
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -44,6 +44,7 @@
 #include "roles_constants.h"
 #include "llscrollbar.h"
 #include "llselectmgr.h"
+#include "lltrans.h"
 #include "llviewertexteditor.h"
 #include "llvfile.h"
 #include "llviewerinventory.h"
@@ -767,7 +768,7 @@ void LLPreviewNotecard::openInExternalEditor()
         {
             if (status == LLExternalEditor::EC_NOT_SPECIFIED) // Use custom message for this error.
             {
-                msg = getString("external_editor_not_set");
+                msg = LLTrans::getString("ExternalEditorNotSet");
             }
             else
             {
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 76a21077ba..f1bb0bc27d 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -1052,7 +1052,7 @@ void LLScriptEdCore::openInExternalEditor()
 		{
 			if (status == LLExternalEditor::EC_NOT_SPECIFIED) // Use custom message for this error.
 			{
-				msg = getString("external_editor_not_set");
+				msg = LLTrans::getString("ExternalEditorNotSet");
 			}
 			else
 			{
diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml
index c56a5e17cd..ed37e9e2cc 100644
--- a/indra/newview/skins/default/xui/en/panel_script_ed.xml
+++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml
@@ -28,10 +28,6 @@
     name="Title">
     Script: [NAME]
   </panel.string>
-  <panel.string
-    name="external_editor_not_set">
-    Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.
-  </panel.string>
   <menu_bar
     bg_visible="false"
     follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1e4ab75d66..982e26ae58 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3936,7 +3936,7 @@ Please check http://status.secondlifegrid.net to see if there is a known problem
   <string name="EmptyOutfitText">There are no items in this outfit</string>
 
  <!-- External editor status codes -->
- <string name="ExternalEditorNotSet">Select an editor using the ExternalEditor setting.</string>
+ <string name="ExternalEditorNotSet">Select an editor by setting the environment variable LL_SCRIPT_EDITOR or the ExternalEditor setting.</string>
  <string name="ExternalEditorNotFound">Cannot find the external editor you specified.
 Try enclosing path to the editor with double quotes.
 (e.g. "/path to my/editor" "%s")</string>
-- 
cgit v1.2.3