diff options
author | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2007-07-02 17:10:30 +0000 |
commit | e5124431b54d4342d4677371fccca5bc7250c079 (patch) | |
tree | 8c9636e78e93cef6ed099d9abd72ec9ccbbf35fe /indra/newview/llfloaterland.cpp | |
parent | ce5e13630cd8f4174549a3ec4ae8c24eec90bb3d (diff) |
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
-rw-r--r-- | indra/newview/llfloaterland.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index b1143c4e7b..1e9acc96c1 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -172,13 +172,11 @@ void LLFloaterLand::show() // (and hence we have the local id). // gParcelMgr->sendParcelAccessListRequest(AL_ACCESS | AL_BAN | AL_RENTER); - // If we've already got the parcel data, fill the - // floater with it. sInstance->mParcel = gParcelMgr->getFloatingParcelSelection(); - if (sInstance->mParcel->getParcel()) - { - sInstance->refresh(); - } + + // Refresh even if not over a region so we don't get an + // uninitialized dialog. The dialog is 0-region aware. + sInstance->refresh(); } //static |