Merge pull request #173 from gavinandresen/testnet_isstandard.

Accept non-standard transactions on testnet.

1 files changed, 2 insertions, 2 deletions

diff --git a/main.cpp b/main.cpp
index 4c8f20c1e4..7e1e420b35 100644
--- a/main.cpp
+++ b/main.cpp
@@ -681,8 +681,8 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
     if (GetSigOpCount() > nSize / 34 || nSize < 100)
         return error("AcceptToMemoryPool() : nonstandard transaction");
 
-    // Rather not work on nonstandard transactions
-    if (!IsStandard())
+    // Rather not work on nonstandard transactions (unless -testnet)
+    if (!fTestNet && !IsStandard())
         return error("AcceptToMemoryPool() : nonstandard transaction type");
 
     // Do we already have it?