diff options
author | Jeff Ames | 2008-08-18 00:39:10 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-18 00:39:10 +0000 |
commit | 6ef9d4da901a346c232458317cca6268da888e2e (patch) | |
tree | dd1d935b10f34f261839da9f9879c02322e8ede7 /OpenSim/Grid/MessagingServer | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.zip opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.tar.gz opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.tar.bz2 opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Grid/MessagingServer')
-rw-r--r-- | OpenSim/Grid/MessagingServer/Main.cs | 7 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index de20d01..c80d48c 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs | |||
@@ -83,14 +83,12 @@ namespace OpenSim.Grid.MessagingServer | |||
83 | public override void Startup() | 83 | public override void Startup() |
84 | { | 84 | { |
85 | base.Startup(); | 85 | base.Startup(); |
86 | 86 | ||
87 | Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); | 87 | Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); |
88 | 88 | ||
89 | m_log.Info("[REGION]: Starting HTTP process"); | 89 | m_log.Info("[REGION]: Starting HTTP process"); |
90 | m_httpServer = new BaseHttpServer(Cfg.HttpPort); | 90 | m_httpServer = new BaseHttpServer(Cfg.HttpPort); |
91 | 91 | ||
92 | |||
93 | |||
94 | msgsvc = new MessageService(Cfg); | 92 | msgsvc = new MessageService(Cfg); |
95 | 93 | ||
96 | if (msgsvc.registerWithUserServer()) | 94 | if (msgsvc.registerWithUserServer()) |
@@ -123,7 +121,6 @@ namespace OpenSim.Grid.MessagingServer | |||
123 | switch (what) | 121 | switch (what) |
124 | { | 122 | { |
125 | case "user": | 123 | case "user": |
126 | |||
127 | try | 124 | try |
128 | { | 125 | { |
129 | //userID = | 126 | //userID = |
@@ -161,8 +158,6 @@ namespace OpenSim.Grid.MessagingServer | |||
161 | m_console.Notice("Region cache cleared! Cleared " + entries.ToString() + " entries"); | 158 | m_console.Notice("Region cache cleared! Cleared " + entries.ToString() + " entries"); |
162 | break; | 159 | break; |
163 | } | 160 | } |
164 | |||
165 | |||
166 | } | 161 | } |
167 | 162 | ||
168 | public override void Shutdown() | 163 | public override void Shutdown() |
diff --git a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs index 5f60871..281beb9 100644 --- a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs +++ b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs | |||
@@ -62,7 +62,7 @@ namespace OpenSim.Grid.MessagingServer | |||
62 | } | 62 | } |
63 | return result; | 63 | return result; |
64 | } | 64 | } |
65 | 65 | ||
66 | public int Count | 66 | public int Count |
67 | { | 67 | { |
68 | get | 68 | get |