From 0b1747ced9a0e0e1e7f35e49feee92b5b78b3118 Mon Sep 17 00:00:00 2001 From: Hazim Gazov Date: Sat, 8 May 2010 22:29:56 -0300 Subject: [PATCH] hopefully this way of removing regions sucks less --- indra/newview/llfloatermessagelog.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/indra/newview/llfloatermessagelog.cpp b/indra/newview/llfloatermessagelog.cpp index 1d8e95418..f19ba284d 100644 --- a/indra/newview/llfloatermessagelog.cpp +++ b/indra/newview/llfloatermessagelog.cpp @@ -821,16 +821,15 @@ void LLFloaterMessageLog::onConfirmCloseCircuit(S32 option, LLSD payload) LLSD args; args["MESSAGE"] = "That host had a region associated with it.\nDo you want to clean that up?"; LLSD payload; - payload["region"] = (int)((void*)regionp); + payload["regionhost"] = regionp->getHost()->getString(); LLNotifications::instance().add("GenericAlertYesCancel", args, payload, onConfirmRemoveRegion); } } // static void LLFloaterMessageLog::onConfirmRemoveRegion(S32 option, LLSD payload) { - LLViewerRegion* regionp = (LLViewerRegion*)((void*)((int)payload["region"].asInteger())); if(option == 0) // yes - LLWorld::getInstance()->removeRegion(regionp->getHost()); + LLWorld::getInstance()->removeRegion(LLHost(payload["regionhost"])); } // static void LLFloaterMessageLog::onClickFilterApply(void* user_data)