diff options
author | Jeff Ames | 2008-03-18 15:30:38 +0000 |
---|---|---|
committer | Jeff Ames | 2008-03-18 15:30:38 +0000 |
commit | e5b91442822df211f9f8277aaf0c40e1339810f3 (patch) | |
tree | 116ac977981e7bea0b7dd4c8f9cbad87e02c5b65 /OpenSim/Framework | |
parent | * Applying Mantis Patch #518.2 - State not persisted in MySQL DataStore (diff) | |
download | opensim-SC_OLD-e5b91442822df211f9f8277aaf0c40e1339810f3.zip opensim-SC_OLD-e5b91442822df211f9f8277aaf0c40e1339810f3.tar.gz opensim-SC_OLD-e5b91442822df211f9f8277aaf0c40e1339810f3.tar.bz2 opensim-SC_OLD-e5b91442822df211f9f8277aaf0c40e1339810f3.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Data/RegionProfileData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/IScene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/PacketPool.cs | 20 |
3 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Framework/Data/RegionProfileData.cs b/OpenSim/Framework/Data/RegionProfileData.cs index 84713b4..96351e0 100644 --- a/OpenSim/Framework/Data/RegionProfileData.cs +++ b/OpenSim/Framework/Data/RegionProfileData.cs | |||
@@ -162,7 +162,7 @@ namespace OpenSim.Framework.Data | |||
162 | simData.serverPort = Convert.ToUInt32((string) responseData["sim_port"]); | 162 | simData.serverPort = Convert.ToUInt32((string) responseData["sim_port"]); |
163 | simData.httpPort = Convert.ToUInt32((string) responseData["http_port"]); | 163 | simData.httpPort = Convert.ToUInt32((string) responseData["http_port"]); |
164 | simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); | 164 | simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); |
165 | simData.serverURI = (string)responseData["server_uri"]; | 165 | simData.serverURI = (string)responseData["server_uri"]; |
166 | simData.httpServerURI = "http://" + simData.serverIP + ":" + simData.httpPort.ToString() + "/"; | 166 | simData.httpServerURI = "http://" + simData.serverIP + ":" + simData.httpPort.ToString() + "/"; |
167 | simData.UUID = new LLUUID((string) responseData["region_UUID"]); | 167 | simData.UUID = new LLUUID((string) responseData["region_UUID"]); |
168 | simData.regionName = (string) responseData["region_name"]; | 168 | simData.regionName = (string) responseData["region_name"]; |
@@ -205,7 +205,7 @@ namespace OpenSim.Framework.Data | |||
205 | simData.httpPort = Convert.ToUInt32((string) responseData["http_port"]); | 205 | simData.httpPort = Convert.ToUInt32((string) responseData["http_port"]); |
206 | simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); | 206 | simData.remotingPort = Convert.ToUInt32((string) responseData["remoting_port"]); |
207 | simData.httpServerURI = "http://" + simData.serverIP + ":" + simData.httpPort.ToString() + "/"; | 207 | simData.httpServerURI = "http://" + simData.serverIP + ":" + simData.httpPort.ToString() + "/"; |
208 | simData.serverURI = (string)responseData["server_uri"]; | 208 | simData.serverURI = (string)responseData["server_uri"]; |
209 | simData.UUID = new LLUUID((string) responseData["region_UUID"]); | 209 | simData.UUID = new LLUUID((string) responseData["region_UUID"]); |
210 | simData.regionName = (string) responseData["region_name"]; | 210 | simData.regionName = (string) responseData["region_name"]; |
211 | 211 | ||
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs index cf2c129..869ca60 100644 --- a/OpenSim/Framework/IScene.cs +++ b/OpenSim/Framework/IScene.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Framework | |||
39 | Up = 1, | 39 | Up = 1, |
40 | Crashed = 2, | 40 | Crashed = 2, |
41 | Starting = 3, | 41 | Starting = 3, |
42 | SlaveScene = 4 | 42 | SlaveScene = 4 |
43 | }; | 43 | }; |
44 | 44 | ||
45 | public interface IScene | 45 | public interface IScene |
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs index 3f8697a..7b67f0b 100644 --- a/OpenSim/Framework/PacketPool.cs +++ b/OpenSim/Framework/PacketPool.cs | |||
@@ -34,12 +34,12 @@ namespace OpenSim.Framework | |||
34 | { | 34 | { |
35 | public sealed class PacketPool | 35 | public sealed class PacketPool |
36 | { | 36 | { |
37 | static public void EncodeProxyMessage(byte[] bytes, ref int numBytes, EndPoint trueEP) | 37 | static public void EncodeProxyMessage(byte[] bytes, ref int numBytes, EndPoint trueEP) |
38 | { | 38 | { |
39 | if( numBytes > 4090 ) // max UPD size = 4096 | 39 | if( numBytes > 4090 ) // max UPD size = 4096 |
40 | { | 40 | { |
41 | throw new Exception("ERROR: No space to encode the proxy EP"); | 41 | throw new Exception("ERROR: No space to encode the proxy EP"); |
42 | } | 42 | } |
43 | 43 | ||
44 | ushort port = (ushort) ((IPEndPoint) trueEP).Port; | 44 | ushort port = (ushort) ((IPEndPoint) trueEP).Port; |
45 | bytes[numBytes++] = (byte)(port % 256); | 45 | bytes[numBytes++] = (byte)(port % 256); |
@@ -55,10 +55,10 @@ namespace OpenSim.Framework | |||
55 | DecodeProxyMessage(bytes, ref numBytes); | 55 | DecodeProxyMessage(bytes, ref numBytes); |
56 | 56 | ||
57 | numBytes = x; | 57 | numBytes = x; |
58 | } | 58 | } |
59 | 59 | ||
60 | static public EndPoint DecodeProxyMessage(byte[] bytes, ref int numBytes) | 60 | static public EndPoint DecodeProxyMessage(byte[] bytes, ref int numBytes) |
61 | { | 61 | { |
62 | // IPv4 Only | 62 | // IPv4 Only |
63 | byte[] addr = new byte[4]; | 63 | byte[] addr = new byte[4]; |
64 | 64 | ||