diff options
author | Adam Frisby | 2007-07-24 04:10:08 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-24 04:10:08 +0000 |
commit | ad5548de9fa18384f7de0520bc7756e312c07191 (patch) | |
tree | de7b0a0bcecb5b9b4ddc7f5009eec3ef07b57b7b | |
parent | * Reduced a significant number of compiler warnings (back down to 9 for all p... (diff) | |
download | opensim-SC-ad5548de9fa18384f7de0520bc7756e312c07191.zip opensim-SC-ad5548de9fa18384f7de0520bc7756e312c07191.tar.gz opensim-SC-ad5548de9fa18384f7de0520bc7756e312c07191.tar.bz2 opensim-SC-ad5548de9fa18384f7de0520bc7756e312c07191.tar.xz |
* More console related changes.
-rw-r--r-- | OpenSim/Framework/Console/LogBase.cs | 5 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/UDPServer.cs | 8 |
3 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs index f2b2720..8b8d8df 100644 --- a/OpenSim/Framework/Console/LogBase.cs +++ b/OpenSim/Framework/Console/LogBase.cs | |||
@@ -114,6 +114,7 @@ namespace OpenSim.Framework.Console | |||
114 | /// <param name="args">WriteLine-style message arguments</param> | 114 | /// <param name="args">WriteLine-style message arguments</param> |
115 | public void Warn(string sender, string format, params object[] args) | 115 | public void Warn(string sender, string format, params object[] args) |
116 | { | 116 | { |
117 | sender = sender.ToUpper(); | ||
117 | int colIdx = (sender.GetHashCode() % 6) + 9; | 118 | int colIdx = (sender.GetHashCode() % 6) + 9; |
118 | ConsoleColor col = (ConsoleColor)colIdx; | 119 | ConsoleColor col = (ConsoleColor)colIdx; |
119 | 120 | ||
@@ -141,6 +142,7 @@ namespace OpenSim.Framework.Console | |||
141 | /// <param name="args">WriteLine-style message arguments</param> | 142 | /// <param name="args">WriteLine-style message arguments</param> |
142 | public void Notice(string sender, string format, params object[] args) | 143 | public void Notice(string sender, string format, params object[] args) |
143 | { | 144 | { |
145 | sender = sender.ToUpper(); | ||
144 | int colIdx = (sender.GetHashCode() % 6) + 9; | 146 | int colIdx = (sender.GetHashCode() % 6) + 9; |
145 | ConsoleColor col = (ConsoleColor)colIdx; | 147 | ConsoleColor col = (ConsoleColor)colIdx; |
146 | 148 | ||
@@ -168,6 +170,7 @@ namespace OpenSim.Framework.Console | |||
168 | /// <param name="args">WriteLine-style message arguments</param> | 170 | /// <param name="args">WriteLine-style message arguments</param> |
169 | public void Error(string sender, string format, params object[] args) | 171 | public void Error(string sender, string format, params object[] args) |
170 | { | 172 | { |
173 | sender = sender.ToUpper(); | ||
171 | int colIdx = (sender.GetHashCode() % 6) + 9; | 174 | int colIdx = (sender.GetHashCode() % 6) + 9; |
172 | ConsoleColor col = (ConsoleColor)colIdx; | 175 | ConsoleColor col = (ConsoleColor)colIdx; |
173 | 176 | ||
@@ -195,6 +198,7 @@ namespace OpenSim.Framework.Console | |||
195 | /// <param name="args">WriteLine-style message arguments</param> | 198 | /// <param name="args">WriteLine-style message arguments</param> |
196 | public void Verbose(string sender, string format, params object[] args) | 199 | public void Verbose(string sender, string format, params object[] args) |
197 | { | 200 | { |
201 | sender = sender.ToUpper(); | ||
198 | int colIdx = (sender.GetHashCode() % 6) + 9; | 202 | int colIdx = (sender.GetHashCode() % 6) + 9; |
199 | ConsoleColor col = (ConsoleColor)colIdx; | 203 | ConsoleColor col = (ConsoleColor)colIdx; |
200 | 204 | ||
@@ -222,6 +226,7 @@ namespace OpenSim.Framework.Console | |||
222 | /// <param name="args">WriteLine-style message arguments</param> | 226 | /// <param name="args">WriteLine-style message arguments</param> |
223 | public void Status(string sender, string format, params object[] args) | 227 | public void Status(string sender, string format, params object[] args) |
224 | { | 228 | { |
229 | sender = sender.ToUpper(); | ||
225 | int colIdx = (sender.GetHashCode() % 6) + 9; | 230 | int colIdx = (sender.GetHashCode() % 6) + 9; |
226 | ConsoleColor col = (ConsoleColor)colIdx; | 231 | ConsoleColor col = (ConsoleColor)colIdx; |
227 | 232 | ||
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 111d40d..32d8da9 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -98,7 +98,7 @@ namespace OpenSim.Grid.UserServer | |||
98 | httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod )); | 98 | httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod )); |
99 | 99 | ||
100 | httpServer.Start(); | 100 | httpServer.Start(); |
101 | m_console.Status("Userserver 0.3 - Startup complete"); | 101 | m_console.Status("SERVER", "Userserver 0.3 - Startup complete"); |
102 | } | 102 | } |
103 | 103 | ||
104 | 104 | ||
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index ec64bad..340ef61 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs | |||
@@ -138,20 +138,20 @@ namespace OpenSim.Region.ClientStack | |||
138 | 138 | ||
139 | public void ServerListener() | 139 | public void ServerListener() |
140 | { | 140 | { |
141 | m_log.Status("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort); | 141 | m_log.Status("SERVER", "UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort); |
142 | 142 | ||
143 | ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort); | 143 | ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort); |
144 | Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); | 144 | Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); |
145 | Server.Bind(ServerIncoming); | 145 | Server.Bind(ServerIncoming); |
146 | 146 | ||
147 | m_log.Verbose("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen"); | 147 | m_log.Verbose("SERVER", "UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen"); |
148 | 148 | ||
149 | ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); | 149 | ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); |
150 | epSender = (EndPoint)ipeSender; | 150 | epSender = (EndPoint)ipeSender; |
151 | ReceivedData = new AsyncCallback(this.OnReceivedData); | 151 | ReceivedData = new AsyncCallback(this.OnReceivedData); |
152 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); | 152 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); |
153 | 153 | ||
154 | m_log.Verbose("UDPServer.cs:ServerListener() - Listening..."); | 154 | m_log.Verbose("SERVER", "UDPServer.cs:ServerListener() - Listening..."); |
155 | 155 | ||
156 | } | 156 | } |
157 | 157 | ||