From bb52cdf4f0104cb61c537041fc9574167fdf98eb Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 13 Sep 2018 18:36:47 +0300
Subject: SL-1307 EEP At startup viewer does not recognize what parcel you are
 on.

---
 indra/newview/llviewerparcelmgr.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index d263e15a10..3ad78efd41 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -659,6 +659,10 @@ LLParcel * LLViewerParcelMgr::getAgentOrSelectedParcel() const
         if (selection)
         {
             parcel = selection->getParcel();
+            if (parcel->getLocalID() == INVALID_PARCEL_ID)
+            {
+                parcel = NULL;
+            }
         }
     }
 
-- 
cgit v1.2.3