Merge remote-tracking branch 'remotes/origin/master' into blob_conversion

Conflicts:
	changelog.txt
	common/database.cpp
	world/client.cpp
	world/zoneserver.cpp
	zone/command.cpp

common/servertalk.h

@@ -83,6 +83,7 @@
 #define ServerOP_QGlobalUpdate		0x0063
 #define ServerOP_QGlobalDelete		0x0064
 #define ServerOP_DepopPlayerCorpse	0x0065
+#define ServerOP_RequestTellQueue	0x0066 // client asks for it's tell queues
 
 #define ServerOP_RaidAdd			0x0100 //in use
 #define ServerOP_RaidRemove			0x0101 //in use
@@ -348,6 +349,7 @@ struct ServerChannelMessage_Struct {
 	uint16 chan_num;
 	uint32 guilddbid;
 	uint16 language;
+	uint8 queued; // 0 = not queued, 1 = queued, 2 = queue full, 3 = offline
 	char message[0];
 };
 
@@ -1250,6 +1252,10 @@ struct ReloadWorld_Struct{
 	uint32 Option;
 };
 
+struct ServerRequestTellQueue_Struct {
+	char	name[64];
+};
+
 #pragma pack()
 
 #endif