diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-06-25 14:53:50 -0700 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-06-25 14:53:50 -0700 |
| commit | af488c97820121eb7f1e35e8e70b8b433cfd91d5 (patch) | |
| tree | 7b0a669d4076660fcc986365277a9f7107e8eb72 /indra/newview | |
| parent | fd799ca57ecce0db70ddc05953f0f1e9a81d51d4 (diff) | |
| parent | 3ec7438388c485e21668d3b1cabe85b3192263b1 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterpay.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpay.cpp b/indra/newview/llfloaterpay.cpp index 51364594e4..ba7526ccd5 100644 --- a/indra/newview/llfloaterpay.cpp +++ b/indra/newview/llfloaterpay.cpp @@ -145,6 +145,9 @@ LLFloaterPay::~LLFloaterPay() { std::for_each(mCallbackData.begin(), mCallbackData.end(), DeletePointer()); // Name callbacks will be automatically disconnected since LLFloater is trackable + + // In case this floater is currently waiting for a reply. + gMessageSystem->setHandlerFuncFast(_PREHASH_PayPriceReply, 0, 0); } BOOL LLFloaterPay::postBuild() |