Merge branch 'feature-cleanup' of github.com:vinniefalco/rippled into develop

Conflicts:
	Builds/VisualStudio2012/RippleD.vcxproj.filters
This commit is contained in:
JoelKatz
2013-07-07 15:29:16 -07:00
22 changed files with 464 additions and 168 deletions

View File

@@ -588,7 +588,7 @@ void Application::setup ()
//
// Allow RPC connections.
//
if (!theConfig.RPC_IP.empty () && theConfig.RPC_PORT)
if (! theConfig.getRpcIP().empty () && theConfig.getRpcPort() != 0)
{
try
{