aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJeff Ames2008-05-14 05:11:23 +0000
committerJeff Ames2008-05-14 05:11:23 +0000
commitc995d60d37032db3198b8496e186aa7a892dc7a8 (patch)
tree826147e66f61c812897d9b0acdb16ebfeb30d4d3 /OpenSim/Framework
parent* Added 3 warnings in response to the warnings. Adam, read the warnings. (diff)
downloadopensim-SC-c995d60d37032db3198b8496e186aa7a892dc7a8.zip
opensim-SC-c995d60d37032db3198b8496e186aa7a892dc7a8.tar.gz
opensim-SC-c995d60d37032db3198b8496e186aa7a892dc7a8.tar.bz2
opensim-SC-c995d60d37032db3198b8496e186aa7a892dc7a8.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSD.cs2
-rw-r--r--OpenSim/Framework/IScene.cs2
-rw-r--r--OpenSim/Framework/PacketPool.cs2
-rw-r--r--OpenSim/Framework/RegionInfo.cs2
-rw-r--r--OpenSim/Framework/SerializableRegionInfo.cs2
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs2
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs6
8 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 399b3b9..705f369 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Communications.Capabilities
196 /// <param name="restMethod"></param> 196 /// <param name="restMethod"></param>
197 public void DeregisterHandlers() 197 public void DeregisterHandlers()
198 { 198 {
199 foreach(string capsName in m_capsHandlers.Caps) 199 foreach (string capsName in m_capsHandlers.Caps)
200 { 200 {
201 m_capsHandlers.Remove(capsName); 201 m_capsHandlers.Remove(capsName);
202 } 202 }
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
index 13361c7..e869267 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
@@ -37,7 +37,7 @@ using libsecondlife;
37namespace OpenSim.Framework.Communications.Capabilities 37namespace OpenSim.Framework.Communications.Capabilities
38{ 38{
39 /// <summary> 39 /// <summary>
40 /// Borrowed from (a older version of ) libsl for now, as their new llsd code doesn't work we our decoding code. 40 /// Borrowed from (a older version of) libsl for now, as their new llsd code doesn't work we our decoding code.
41 /// </summary> 41 /// </summary>
42 public static class LLSD 42 public static class LLSD
43 { 43 {
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 018b51f..82002c2 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -31,7 +31,7 @@ namespace OpenSim.Framework
31{ 31{
32 public delegate void restart(RegionInfo thisRegion); 32 public delegate void restart(RegionInfo thisRegion);
33 33
34 //public delegate void regionup ( RegionInfo thisRegion ); 34 //public delegate void regionup (RegionInfo thisRegion);
35 35
36 public enum RegionStatus : int 36 public enum RegionStatus : int
37 { 37 {
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 5eac9de..af8efe8 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -163,7 +163,7 @@ namespace OpenSim.Framework
163 { 163 {
164 PacketType type=packet.Type; 164 PacketType type=packet.Type;
165 165
166 if(pool[type] == null) 166 if (pool[type] == null)
167 { 167 {
168 pool[type] = new Stack(); 168 pool[type] = new Stack();
169 } 169 }
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 88c9ea6..8380633 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Framework
122 get 122 get
123 { 123 {
124 // Old one defaults to IPv6 124 // Old one defaults to IPv6
125 //return new IPEndPoint( Dns.GetHostAddresses( m_externalHostName )[0], m_internalEndPoint.Port ); 125 //return new IPEndPoint(Dns.GetHostAddresses(m_externalHostName)[0], m_internalEndPoint.Port);
126 126
127 IPAddress ia = null; 127 IPAddress ia = null;
128 // If it is already an IP, don't resolve it - just return directly 128 // If it is already an IP, don't resolve it - just return directly
diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs
index 97aa8db..a87d5ef 100644
--- a/OpenSim/Framework/SerializableRegionInfo.cs
+++ b/OpenSim/Framework/SerializableRegionInfo.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Framework
116 get 116 get
117 { 117 {
118 // Old one defaults to IPv6 118 // Old one defaults to IPv6
119 //return new IPEndPoint( Dns.GetHostAddresses( m_externalHostName )[0], m_internalEndPoint.Port ); 119 //return new IPEndPoint(Dns.GetHostAddresses(m_externalHostName)[0], m_internalEndPoint.Port);
120 120
121 IPAddress ia = null; 121 IPAddress ia = null;
122 // If it is already an IP, don't resolve it - just return directly 122 // If it is already an IP, don't resolve it - just return directly
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 2f495a9..f36b2fb 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -412,7 +412,7 @@ namespace OpenSim.Framework.Servers
412 412
413 public void HandleHTTPRequest(HttpListenerRequest request, HttpListenerResponse response) 413 public void HandleHTTPRequest(HttpListenerRequest request, HttpListenerResponse response)
414 { 414 {
415 switch( request.HttpMethod ) 415 switch (request.HttpMethod)
416 { 416 {
417 case "OPTIONS": 417 case "OPTIONS":
418 response.StatusCode = 200; 418 response.StatusCode = 200;
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index b8ad83a..344309d 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -54,9 +54,9 @@ namespace OpenSim.Framework.Servers
54 /// </summary> 54 /// </summary>
55 public virtual void Shutdown() 55 public virtual void Shutdown()
56 { 56 {
57 if(m_console != null) 57 if (m_console != null)
58 { 58 {
59 m_console.Close(); 59 m_console.Close();
60 } 60 }
61 Environment.Exit(0); 61 Environment.Exit(0);
62 } 62 }
@@ -112,7 +112,7 @@ namespace OpenSim.Framework.Servers
112 /// </summary> 112 /// </summary>
113 private void Notice(string msg) 113 private void Notice(string msg)
114 { 114 {
115 if(m_console != null) 115 if (m_console != null)
116 { 116 {
117 m_console.Notice(msg); 117 m_console.Notice(msg);
118 } 118 }