From b658e4115d137713ab55bf73f517a528deffb534 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Tue, 6 Apr 2010 16:02:14 +0300 Subject: Fixed normal bug EXT-6464 (Buy pass from popup menu doesn't work). - The bug was caused by deselection of parcel(because of zero ref count to parcel selection) after appearance of alert with ok/cancel. Added setting pointer to this selection before notification appearance and nullifying pointer it after user chooses ok or cancel. Nullifying will always take place because alert is modal, so there is no chance that LLPanelLandGeneral::cbBuyPass() won't be called. Reviewed by Mike at https://codereview.productengine.com/secondlife/r/180/ --HG-- branch : product-engine --- indra/newview/llfloaterland.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/llfloaterland.h') 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& 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 sSelectionForBuyPass; + static LLHandle sBuyPassDialogHandle; }; -- cgit v1.2.3