Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
jed
2012-08-15 10:35:26 -07:00
26 changed files with 207 additions and 137 deletions

View File

@@ -833,6 +833,9 @@ Json::Value RPCServer::doAccountWalletSet(const Json::Value& params) {
Json::Value RPCServer::doConnect(const Json::Value& params)
{
if (theConfig.RUN_STANDALONE)
return "cannot connect in standalone mode";
// connect <ip> [port]
std::string strIp;
int iPort = -1;