Merge

--HG--
branch : trunk

1 files changed, 2 insertions, 0 deletions

diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index b8d282569f1..28da3b01529 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -595,6 +595,7 @@ class ObjectMgr
         uint32 GenerateLowGuid(HighGuid guidhigh);
         uint32 GenerateArenaTeamId();
         uint32 GenerateAuctionID();
+        uint64 GenerateEquipmentSetGuid();
         uint32 GenerateGuildId();
         uint32 GenerateItemTextID();
         uint32 GenerateMailID();
@@ -819,6 +820,7 @@ class ObjectMgr
         // first free id for selected id type
         uint32 m_arenaTeamId;
         uint32 m_auctionid;
+        uint64 m_equipmentSetGuid;
         uint32 m_guildId;
         uint32 m_ItemTextId;
         uint32 m_mailid;