From 69f273eb0e9f37a1ff728105f74edfdc4b58a7a3 Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Fri, 11 Oct 2013 13:14:59 +0200 Subject: [PATCH] Don't crash if pay floater is closed before reply arrives from the server Fix from upstream Potentially fixes http://crash.singularityviewer.org/crashes.php?stacktrace=processPayPriceReply --- indra/newview/llgivemoney.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/llgivemoney.cpp b/indra/newview/llgivemoney.cpp index 6816c378a..bd9243827 100644 --- a/indra/newview/llgivemoney.cpp +++ b/indra/newview/llgivemoney.cpp @@ -136,6 +136,8 @@ LLFloaterPay::LLFloaterPay(const std::string& name, // Destroys the object LLFloaterPay::~LLFloaterPay() { + // In case this floater is currently waiting for a reply. + gMessageSystem->setHandlerFuncFast(_PREHASH_PayPriceReply, 0, 0); } // static