summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterworldmap.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
-rw-r--r--indra/newview/llfloaterworldmap.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index a39c2be6bf..d8ed27173d 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -439,6 +439,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();