diff options
author | Brian <runningnak3d@gmail.com> | 2010-07-02 06:06:40 -0600 |
---|---|---|
committer | Brian <runningnak3d@gmail.com> | 2010-07-02 06:06:40 -0600 |
commit | a52233f40eaed23623b8a4be93d9b513997f0f53 (patch) | |
tree | ac1bfc0056981b1f79067253f14bd5302247778f /src/server/game/Globals/ObjectMgr.cpp | |
parent | baf108e5ccc0ee42efcefa4a87e2784421df15c5 (diff) | |
parent | e0e36b5db5777a08660d1c2c243afd8f60b49a43 (diff) |
* Merge public repo
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index c7ed4cfb330..ae8dd503caa 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -8266,7 +8266,7 @@ void ObjectMgr::LoadGossipMenuItems() QueryResult_AutoPtr result = WorldDatabase.Query( "SELECT menu_id, id, option_icon, option_text, option_id, npc_option_npcflag, " "action_menu_id, action_poi_id, action_script_id, box_coded, box_money, box_text " - "FROM gossip_menu_option"); + "FROM gossip_menu_option ORDER BY menu_id, id"); if (!result) { |