summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-08-13 17:21:13 -0700
committerMerov Linden <merov@lindenlab.com>2014-08-13 17:21:13 -0700
commitf02ac3b7dc8c0496a639e881f6a5f8c62bbdd7c0 (patch)
tree7d6bbb5742caed7850676e5b34441dc4ebc24d3b /indra
parent30972fca1d1048a1dbfcb28d58489cd687820ec0 (diff)
Switch the merchant bypass off (that's debug only, for dev only...)
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llmarketplacefunctions.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index c2b4f34ac2..b37ae30021 100755
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -124,7 +124,7 @@ void log_SLM_infos(const std::string& request, const std::string& url, const std
// Merov: This is a temporary hack used by dev while secondlife-staging is down...
// *TODO : Suppress that before shipping!
-static bool sBypassMerchant = true;
+static bool sBypassMerchant = false;
class LLSLMGetMerchantResponder : public LLHTTPClient::Responder
{