From dbd6b58bf26e6989f95eb6ef4ff3870da7a514d3 Mon Sep 17 00:00:00 2001 From: "simon@Simon-PC.lindenlab.com" Date: Thu, 31 Jan 2013 10:53:03 -0800 Subject: Fix funky merge problem --- indra/newview/llmeshrepository.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index e81c863608..09003e3e53 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -416,14 +416,6 @@ public: } } - ~LLWholeModelFeeResponder() - { - if (mThread) - { - mThread->stopRequest(); - } - } - virtual void completed(U32 status, const std::string& reason, const LLSD& content) -- cgit v1.2.3