summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterland.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2007-01-23 19:12:31 +0000
committerSteven Bennetts <steve@lindenlab.com>2007-01-23 19:12:31 +0000
commit7f50e28b0f3905f95299f7d5d63e0fd82e103bed (patch)
tree99c01f8184cc9a5ca90484661b30a8ac6dcd60f4 /indra/newview/llfloaterland.cpp
parent47576ad1f77ecbe606fa1bd3addac610fad43dd7 (diff)
merge -r 56842:57026 maintenance.
Diffstat (limited to 'indra/newview/llfloaterland.cpp')
-rw-r--r--indra/newview/llfloaterland.cpp8
1 files changed, 7 insertions, 1 deletions
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)