Didn't notice I removed this from the mergening when I resolved merge conflicts, oops
This commit is contained in:
		
							parent
							
								
									49c3dcdee5
								
							
						
					
					
						commit
						f96bd6cc3c
					
				@ -358,6 +358,8 @@ private:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  QVector<chatlogpiece> ic_chatlog_history;
 | 
					  QVector<chatlogpiece> ic_chatlog_history;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  QQueue<QStringList> chatmessage_queue;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // triggers ping_server() every 45 seconds
 | 
					  // triggers ping_server() every 45 seconds
 | 
				
			||||||
  QTimer *keepalive_timer;
 | 
					  QTimer *keepalive_timer;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user