Merged in maxim_productengine/viewer-eep (pull request #85)

SL-9656 and SL-9652 fixed
meow-7.2.2
Rider Linden 2018-09-14 15:44:31 +00:00
commit 13efe74bc1
3 changed files with 3 additions and 1 deletions

View File

@ -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;
}

View File

@ -55,6 +55,7 @@
left_pad="10"
max_length_bytes="100"
name="day_cycle_name"
prevalidate_callback="ascii"
top="5"
width="200"
height="21" />

View File

@ -43,6 +43,7 @@
left_delta="45"
width="250"
name="settings_name"
prevalidate_callback="ascii"
max_length_chars="32"
height="20"/>
<button