Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Griatch 2017-10-05 23:18:22 +02:00
commit 2585d33e7c
9 changed files with 131 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/server/portal/portal.py
View file

@ -293,9 +293,9 @@ if WEBSERVER_ENABLED:
# create ajax client processes at /webclientdata
from evennia.server.portal import webclient_ajax
webclient = webclient_ajax.WebClient()
webclient.sessionhandler = PORTAL_SESSIONS
web_root.putChild("webclientdata", webclient)
ajax_webclient = webclient_ajax.AjaxWebClient()
ajax_webclient.sessionhandler = PORTAL_SESSIONS
web_root.putChild("webclientdata", ajax_webclient)
webclientstr = "\n + webclient (ajax only)"
if WEBSOCKET_CLIENT_ENABLED and not websocket_started: