Merge branch 'master' into 4.x

This commit is contained in:
Nay committed 2011-12-27 15:37:06 +00:00
commit bdab38b4cc
5 files changed
+17 -23

No files matched your search

+2 -2
View File
@@ -1018,12 +1018,12 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
// Update the last_ip in the database
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(LOGIN_UPDATE_LAST_IP);
PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPDATE_LAST_IP);
stmt->setString(0, address);
stmt->setString(1, account);
CharacterDatabase.Execute(stmt);
LoginDatabase.Execute(stmt);
// NOTE ATM the socket is single-threaded, have this in mind ...
ACE_NEW_RETURN (m_Session, WorldSession (id, this, AccountTypes(security), expansion, mutetime, locale, recruiter, isRecruiter), -1);