From fbf49910f34278a39dffff7e6c8bc654839988fb Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Mon, 8 Jan 2007 21:43:30 +0000 Subject: svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --- indra/newview/llviewermenu.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewermenu.cpp') diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 8eae25fa63..689dcee663 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6479,7 +6479,14 @@ class LLShowFloater : public view_listener_t { if (gParcelMgr->selectionEmpty()) { - gParcelMgr->selectParcelAt(gAgent.getPositionGlobal()); + if (gLastHitPosGlobal.isExactlyZero()) + { + gParcelMgr->selectParcelAt(gAgent.getPositionGlobal()); + } + else + { + gParcelMgr->selectParcelAt( gLastHitPosGlobal ); + } } LLFloaterLand::show(); @@ -6488,7 +6495,14 @@ class LLShowFloater : public view_listener_t { if (gParcelMgr->selectionEmpty()) { - gParcelMgr->selectParcelAt(gAgent.getPositionGlobal()); + if (gLastHitPosGlobal.isExactlyZero()) + { + gParcelMgr->selectParcelAt(gAgent.getPositionGlobal()); + } + else + { + gParcelMgr->selectParcelAt( gLastHitPosGlobal ); + } } gParcelMgr->startBuyLand(); -- cgit v1.2.3