* Huge merge with original branch

--HG--
branch : trunk

1 files changed, 11 insertions, 11 deletions

diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index ec44bdab7d4..f8c226110af 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -952,7 +952,7 @@ bool ChatHandler::HandleReloadWpScriptsCommand(const char* arg)
         sLog.outString( "Re-Loading Scripts from `waypoint_scripts`...");
 
 	objmgr.LoadWaypointScripts();
- 
+
 	if(*arg!='a')
         SendGlobalGMSysMessage("DB table `waypoint_scripts` reloaded.");
 
@@ -1159,7 +1159,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args)
         }else{
             PSendSysMessage(LANG_YOURS_SECURITY_CHANGED, m_session->GetPlayer()->GetName(), gm);
         }
-            
+
         LoginDatabase.PExecute("UPDATE account SET gmlevel = '%d' WHERE id = '%u'", gm, targetAccountId);
         return true;
     }else
@@ -1167,7 +1167,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args)
         // Check for second parameter
         if(!arg2)
             return false;
-        
+
         // Check for account
         targetAccountName = arg1;
         if(!AccountMgr::normilizeString(targetAccountName))
@@ -1176,7 +1176,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-        
+
         // Check for invalid specified GM level.
         gm = atoi(arg2);
         if ( (gm < SEC_PLAYER || gm > SEC_ADMINISTRATOR) )
@@ -1185,7 +1185,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-        
+
         targetAccountId = accmgr.GetId(arg1);
         /// m_session==NULL only for console
         uint32 plSecurity = m_session ? m_session->GetSecurity() : SEC_CONSOLE;
@@ -7086,7 +7086,7 @@ bool ChatHandler::HandleFreezeCommand(const char *args)
     {
         player = getSelectedPlayer();
         if (player) //prevent crash with creature as target
-        {   
+        {
             name = player->GetName();
             normalizePlayerName(name);
         }
@@ -7147,7 +7147,7 @@ bool ChatHandler::HandleFreezeCommand(const char *args)
                 if (eff>=TOTAL_SPELL_EFFECTS)
                     continue;
                 if( eff == SPELL_EFFECT_APPLY_AREA_AURA_PARTY || eff == SPELL_EFFECT_APPLY_AURA ||
-                    eff == SPELL_EFFECT_PERSISTENT_AREA_AURA || eff == SPELL_EFFECT_APPLY_AREA_AURA_FRIEND || 
+                    eff == SPELL_EFFECT_PERSISTENT_AREA_AURA || eff == SPELL_EFFECT_APPLY_AREA_AURA_FRIEND ||
                     eff == SPELL_EFFECT_APPLY_AREA_AURA_ENEMY)
                 {
                     Aura *Aur = CreateAura(spellInfo, i, NULL, player);
@@ -7171,7 +7171,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args)
     {
         player = getSelectedPlayer();
         if (player) //prevent crash with creature as target
-        {   
+        {
             name = player->GetName();
         }
     }
@@ -7203,7 +7203,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args)
     if (!player)
     {
         if (TargetName)
-        {        
+        {
             //check for offline players
             QueryResult *result = CharacterDatabase.PQuery("SELECT characters.guid FROM `characters` WHERE characters.name = '%s'",name.c_str());
             if(!result)
@@ -7322,7 +7322,7 @@ bool ChatHandler::HandleBindSightCommand(const char* args)
     Unit* pUnit = getSelectedUnit();
     if (!pUnit)
         return false;
-        
+
     if (m_session->GetPlayer()->isPossessing())
         return false;
 
@@ -7335,7 +7335,7 @@ bool ChatHandler::HandleUnbindSightCommand(const char* args)
 {
     if (m_session->GetPlayer()->isPossessing())
         return false;
-        
+
     m_session->GetPlayer()->RemoveFarsightTarget();
     return true;
 }