From d76c4788f28901c87b21e5cf25cc3bf727037f69 Mon Sep 17 00:00:00 2001 From: DenialMC Date: Wed, 8 Apr 2015 21:58:39 +0300 Subject: [PATCH] no message --- astron/config/clientagent-0.yml | 4 ++++ astron/config/clientagent-0.yml.rej | 12 ++++++++++++ astron/config/clientagent-1.yml | 4 ++++ astron/config/clientagent-2.yml | 4 ++++ astron/config/clientagent-3.yml | 4 ++++ astron/config/clientagent-4.yml | 4 ++++ astron/config/clientagent-5.yml | 4 ++++ astron/config/clientagent-6.yml | 4 ++++ astron/config/clientagent-7.yml | 4 ++++ astron/config/cluster.yml | 4 ++++ astron/dclass/united.dc.rej | 14 ++++++++++++++ 11 files changed, 62 insertions(+) create mode 100644 astron/config/clientagent-0.yml.rej create mode 100644 astron/dclass/united.dc.rej diff --git a/astron/config/clientagent-0.yml b/astron/config/clientagent-0.yml index fab5d392..3eb32408 100644 --- a/astron/config/clientagent-0.yml +++ b/astron/config/clientagent-0.yml @@ -8,6 +8,10 @@ general: - ../dclass/toon.dc uberdogs: + - class: CentralLogger + id: 4688 + anonymous: false + - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-0.yml.rej b/astron/config/clientagent-0.yml.rej new file mode 100644 index 00000000..2224c9f9 --- /dev/null +++ b/astron/config/clientagent-0.yml.rej @@ -0,0 +1,12 @@ +diff a/astron/config/clientagent-0.yml b/astron/config/clientagent-0.yml (rejected hunks) +@@ -8,10 +8,6 @@ + - ../dclass/toon.dc + + uberdogs: +- - class: CentralLogger +- id: 4688 +- anonymous: false +- + - class: ClientServicesManager + id: 4665 + anonymous: true diff --git a/astron/config/clientagent-1.yml b/astron/config/clientagent-1.yml index b3c70b0c..f1a15803 100644 --- a/astron/config/clientagent-1.yml +++ b/astron/config/clientagent-1.yml @@ -8,6 +8,10 @@ general: - ../dclass/toon.dc uberdogs: + - class: CentralLogger + id: 4688 + anonymous: false + - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-2.yml b/astron/config/clientagent-2.yml index df23b6d8..5aa06124 100644 --- a/astron/config/clientagent-2.yml +++ b/astron/config/clientagent-2.yml @@ -8,6 +8,10 @@ general: - ../dclass/toon.dc uberdogs: + - class: CentralLogger + id: 4688 + anonymous: false + - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-3.yml b/astron/config/clientagent-3.yml index 811837e2..fff8afbc 100644 --- a/astron/config/clientagent-3.yml +++ b/astron/config/clientagent-3.yml @@ -8,6 +8,10 @@ general: - ../dclass/toon.dc uberdogs: + - class: CentralLogger + id: 4688 + anonymous: false + - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-4.yml b/astron/config/clientagent-4.yml index b99a122a..ddea5de7 100644 --- a/astron/config/clientagent-4.yml +++ b/astron/config/clientagent-4.yml @@ -8,6 +8,10 @@ general: - ../dclass/toon.dc uberdogs: + - class: CentralLogger + id: 4688 + anonymous: false + - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-5.yml b/astron/config/clientagent-5.yml index ef034083..041eff3d 100644 --- a/astron/config/clientagent-5.yml +++ b/astron/config/clientagent-5.yml @@ -8,6 +8,10 @@ general: - ../dclass/toon.dc uberdogs: + - class: CentralLogger + id: 4688 + anonymous: false + - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-6.yml b/astron/config/clientagent-6.yml index 2bcb2f3f..d5e7f4ca 100644 --- a/astron/config/clientagent-6.yml +++ b/astron/config/clientagent-6.yml @@ -8,6 +8,10 @@ general: - ../dclass/toon.dc uberdogs: + - class: CentralLogger + id: 4688 + anonymous: false + - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-7.yml b/astron/config/clientagent-7.yml index ca93110b..4aca58ca 100644 --- a/astron/config/clientagent-7.yml +++ b/astron/config/clientagent-7.yml @@ -8,6 +8,10 @@ general: - ../dclass/toon.dc uberdogs: + - class: CentralLogger + id: 4688 + anonymous: false + - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/cluster.yml b/astron/config/cluster.yml index 41b8d948..c9e951bb 100644 --- a/astron/config/cluster.yml +++ b/astron/config/cluster.yml @@ -10,6 +10,10 @@ messagedirector: bind: 127.0.0.1:7100 uberdogs: + - class: CentralLogger + id: 4688 + anonymous: false + - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/dclass/united.dc.rej b/astron/dclass/united.dc.rej new file mode 100644 index 00000000..17ddee61 --- /dev/null +++ b/astron/dclass/united.dc.rej @@ -0,0 +1,14 @@ +diff a/astron/dclass/united.dc b/astron/dclass/united.dc (rejected hunks) +@@ -13,12 +13,9 @@ + from otp.friends import GuildManager/AI/UD + from otp.friends import FriendInfo + from otp.friends import AvatarFriendInfo +-from otp.distributed import ObjectServer/AI/UD + from otp.distributed import DistributedDistrict/AI/UD + from otp.distributed import DistributedDirectory/AI +-from otp.distributed import DistributedTestObject/AI + from otp.chat import ChatAgent/UD +-from otp.distributed import CentralLogger/AI/UD + from otp.avatar import AvatarHandle + + typedef uint8 bool;