1 files changed, 9 insertions, 1 deletions

diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index af0e5c0..967e6d0 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -312,7 +312,7 @@ void LLFloaterWorldMap::show(void*, BOOL center_on_target)
         BOOL was_visible = gFloaterWorldMap->getVisible();
 
         gFloaterWorldMap->mIsClosing = FALSE;
-        gFloaterWorldMap->open();
+        gFloaterWorldMap->open();               /* Flawfinder: ignore */
 
         LLWorldMapView* map_panel;
         map_panel = (LLWorldMapView*)gFloaterWorldMap->mTabs->getCurrentPanel();
@@ -458,6 +458,14 @@ void LLFloaterWorldMap::draw()
                 return;
         }
 
+        // On orientation island, users don't have a home location yet, so don't
+        // let them teleport "home".  It dumps them in an often-crowed welcome
+        // area (infohub) and they get confused. JC
+        LLViewerRegion* regionp = gAgent.getRegion();
+        bool agent_on_prelude = (regionp && regionp->isPrelude());
+        bool enable_go_home = gAgent.isGodlike() || !agent_on_prelude;
+        childSetEnabled("Go Home", enable_go_home);
+
         updateLocation();
         
         LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus();