merge

--HG-- branch : trunk
2010-09-26 12:25:01 -07:00
parent ededb13915 23a331d4bf
commit 7375951ea8
7 changed files with 57 additions and 51 deletions
@@ -1071,7 +1071,7 @@ void WorldSession::HandleSetActionButtonOpcode(WorldPacket& recv_data)
                sLog.outError("MISC: Unknown action button type %u for action %u into button %u", type, action, button);
                return;
        }
-        GetPlayer()->addActionButton(button, action, type, uint8(GetPlayer()->GetActiveSpec()));
+        GetPlayer()->addActionButton(button, action, type);
    }
 }