Skip to content
Snippets Groups Projects
Commit 004ee526 authored by Nigel Reed's avatar Nigel Reed Committed by Rob Swindell
Browse files

Add ssl support for server to server connections.

parent 4bdaebf9
No related branches found
No related tags found
2 merge requests!455Update branch with changes from master,!445Add ssl support for server to server connections.
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 3 deletions
xtrn/mrc/mrc-client.js
+ 2
− 3
View file @ 004ee526
...@@ -13,7 +13,7 @@ load('scrollbar.js'); ...@@ -13,7 +13,7 @@ load('scrollbar.js');
load('inputline.js'); load('inputline.js');
load(js.startup_dir + 'mrc-session.js'); load(js.startup_dir + 'mrc-session.js');
js.on_exit("js.time_limit = " + js.time_limit); js.on_exit("js.counter = 0);
js.time_limit=0; js.time_limit=0;
var input_state = 'chat'; var input_state = 'chat';
...@@ -24,14 +24,13 @@ f.open('r'); ...@@ -24,14 +24,13 @@ f.open('r');
const settings = { const settings = {
root: f.iniGetObject(), root: f.iniGetObject(),
startup: f.iniGetObject('startup'), startup: f.iniGetObject('startup'),
aliases: f.iniGetObject('aliases'), aliases: f.iniGetObject('aliases') || {},
client: f.iniGetObject('client') || {} client: f.iniGetObject('client') || {}
}; };
f.close(); f.close();
f = undefined; f = undefined;
log(LOG_DEBUG,"settings is " + settings.client.show_nicks);
var show_nicks = (settings.client.show_nicks === true) ? true : false; var show_nicks = (settings.client.show_nicks === true) ? true : false;
const NICK_COLOURS = [ const NICK_COLOURS = [
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment