diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
| commit | 52293aa4bb7af45d2c3733f20982f4acb030c2d8 (patch) | |
| tree | f963815f91b6259ea403d41807d19b69e759897e /indra/newview/llfloaterland.h | |
| parent | 516ec63f52245a777725d29efe3c35e4e4e72936 (diff) | |
| parent | 8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llfloaterland.h')
| -rw-r--r-- | indra/newview/llfloaterland.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h index fe80766a74..0a743e5215 100644 --- a/indra/newview/llfloaterland.h +++ b/indra/newview/llfloaterland.h @@ -234,6 +234,11 @@ protected: LLSafeHandle<LLParcelSelection>& mParcel; + // This pointer is needed to avoid parcel deselection until buying pass is completed or canceled. + // Deselection happened because of zero references to parcel selection, which took place when + // "Buy Pass" was called from popup menu(EXT-6464) + static LLPointer<LLParcelSelection> sSelectionForBuyPass; + static LLHandle<LLFloater> sBuyPassDialogHandle; }; |