diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-08 21:43:30 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-08 21:43:30 +0000 |
| commit | fbf49910f34278a39dffff7e6c8bc654839988fb (patch) | |
| tree | 627ae5b2818f671898b855d5ef8d02a9789d9432 /indra/newview/llviewermenu.cpp | |
| parent | c618a55f769946369e3d80f71eeb3c42042ab4e0 (diff) | |
svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
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(); |