Merge commit 'origin/master' into 310

This commit is contained in:
tomrus88 2009-04-25 17:24:05 +04:00
commit 55d6fbe3cb
46 changed files with 325 additions and 1369 deletions

View file

@ -3650,7 +3650,7 @@ bool ChatHandler::HandleWpImportCommand(const char *args)
}
//rename characters
bool ChatHandler::HandleRenameCommand(const char* args)
bool ChatHandler::HandleCharacterRenameCommand(const char* args)
{
Player* target = NULL;
uint64 targetGUID = 0;
@ -3712,7 +3712,7 @@ bool ChatHandler::HandleRenameCommand(const char* args)
}
// customize characters
bool ChatHandler::HandleCustomizeCommand(const char* args)
bool ChatHandler::HandleCharacterCustomizeCommand(const char* args)
{
Player* target = NULL;
uint64 targetGUID = 0;