From d1f746ff7ff251f1fdf6c8a8eeb1b350cad8750e Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Fri, 14 Sep 2018 15:47:52 +0300 Subject: SL-9656 FIXED EEP viewer crash after opening About Land and then right-clicking a Day Cycle in Inventory --- indra/newview/llviewerparcelmgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 3ad78efd41..5a393220c3 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -659,7 +659,7 @@ LLParcel * LLViewerParcelMgr::getAgentOrSelectedParcel() const if (selection) { parcel = selection->getParcel(); - if (parcel->getLocalID() == INVALID_PARCEL_ID) + if (parcel && (parcel->getLocalID() == INVALID_PARCEL_ID)) { parcel = NULL; } -- cgit v1.2.3 From a2bd8673d71f052211e3e3cc95c7fa5257d2a4b1 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Fri, 14 Sep 2018 16:03:05 +0300 Subject: SL-9652 FIXED EEP Not allowed characters can be used for Environment Assets name --- indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml | 1 + indra/newview/skins/default/xui/en/floater_fixedenvironment.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml index aec71fda07..0c4d342297 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml @@ -55,6 +55,7 @@ left_pad="10" max_length_bytes="100" name="day_cycle_name" + prevalidate_callback="ascii" top="5" width="200" height="21" /> diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml index 9b572ce9b0..7cf7e8bb32 100644 --- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml +++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml @@ -43,6 +43,7 @@ left_delta="45" width="250" name="settings_name" + prevalidate_callback="ascii" max_length_chars="32" height="20"/>