psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

Merge commit 'origin'

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2009-04-02 08:57:11 +02:00
commit b04dfd66f2
4 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
world/net/include/place.gen
View file

@ -146,7 +146,7 @@ inherit NET_PATH "place/mailcast";
# ifdef PUBLIC
inherit NET_PATH "place/public";
# else
// special case in the archetype options logic, see also the .pl
// special case in the archetype options logic, see also psyconf
# ifndef PLACE_HISTORY
# ifdef PLACE_HISTORY_EXPORT
# define PLACE_HISTORY

4
world/net/person.c
View file

@ -2515,6 +2515,10 @@ reboot(reason, restart, pass) {
//unless (clonep(ME)) return;
if (blueprint(ME) == ME) return;
P2(("%O shutting down\n", ME))
// temporary, please remove after 2009-04
if (!v("locations")) vSet("locations", ([]));
#if !defined(SLAVE) && !defined(_flag_disable_info_session)
if (ONLINE) {
// same in net/psyc/circuit.c