From 7f50e28b0f3905f95299f7d5d63e0fd82e103bed Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 23 Jan 2007 19:12:31 +0000 Subject: merge -r 56842:57026 maintenance. --- indra/newview/llfloaterland.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloaterland.cpp') diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 6897e49dd9..3b4c7c2f59 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -95,6 +95,7 @@ LLFloaterLand* LLFloaterLand::sInstance = NULL; LLParcelSelectionObserver* LLFloaterLand::sObserver = NULL; S32 LLFloaterLand::sLastTab = 0; BOOL LLFloaterLand::sRequestReplyOnUpdate = TRUE; +LLViewHandle LLPanelLandGeneral::sBuyPassDialogHandle; // Local classes class LLParcelSelectionObserver : public LLParcelObserver @@ -943,7 +944,7 @@ void LLPanelLandGeneral::onClickBuyPass(void* deselect_when_done) args["[PARCEL_NAME]"] = parcel_name; args["[TIME]"] = time; - gViewerWindow->alertXml("LandBuyPass", args, cbBuyPass, deselect_when_done); + sBuyPassDialogHandle = gViewerWindow->alertXml("LandBuyPass", args, cbBuyPass, deselect_when_done)->getHandle(); } // static @@ -980,6 +981,11 @@ void LLPanelLandGeneral::cbBuyPass(S32 option, void* data) } } +//static +BOOL LLPanelLandGeneral::buyPassDialogVisible() +{ + return LLFloater::getFloaterByHandle(sBuyPassDialogHandle) != NULL; +} // static void LLPanelLandGeneral::onCommitAny(LLUICtrl *ctrl, void *userdata) -- cgit v1.2.3