Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Server/WorldSocket.cpp
This commit is contained in:
Nay committed 2013-02-09 20:33:30 +00:00
commit 984e1feadf
23 files changed
+101 -126

No files matched your search

+3 -1
View File
@@ -1565,7 +1565,9 @@ void Player::Update(uint32 p_time)
GetSession()->m_muteTime = 0;
PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_MUTE_TIME);
stmt->setInt64(0, 0); // Set the mute time to 0
stmt->setUInt32(1, GetSession()->GetAccountId());
stmt->setString(1, "");
stmt->setString(2, "");
stmt->setUInt32(3, GetSession()->GetAccountId());
LoginDatabase.Execute(stmt);
}