aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJeff Ames2008-06-04 09:59:27 +0000
committerJeff Ames2008-06-04 09:59:27 +0000
commit4ec4e16c809cf86a63b736d2b7b6ad7291595a5f (patch)
treecfa896ef9057228171e2ee39c4807060101ba90b /OpenSim/Framework
parent* If a ThreadAbortException reaches AuthUser() then let it pass through unmol... (diff)
downloadopensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.zip
opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.gz
opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.bz2
opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.xz
Formatting cleanup, minor refactoring, svn properties.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ClientManager.cs1
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs30
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs4
3 files changed, 18 insertions, 17 deletions
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index a70f7fa..b557ec1 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -137,6 +137,7 @@ namespace OpenSim.Framework
137 } 137 }
138 } 138 }
139 } 139 }
140
140 [Obsolete("Using Obsolete to drive development is invalid. Obsolete presumes that something new has already been created to replace this.")] 141 [Obsolete("Using Obsolete to drive development is invalid. Obsolete presumes that something new has already been created to replace this.")]
141 public uint[] GetAllCircuits(LLUUID agentId) 142 public uint[] GetAllCircuits(LLUUID agentId)
142 { 143 {
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 6753a21..0ee21ac 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -40,14 +40,14 @@ namespace OpenSim.Framework.Servers
40 public abstract class BaseOpenSimServer 40 public abstract class BaseOpenSimServer
41 { 41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 protected ConsoleBase m_console; 44 protected ConsoleBase m_console;
45 45
46 /// <summary> 46 /// <summary>
47 /// Time at which this server was started 47 /// Time at which this server was started
48 /// </summary> 48 /// </summary>
49 protected DateTime m_startuptime; 49 protected DateTime m_startuptime;
50 50
51 /// <summary> 51 /// <summary>
52 /// Server version information. Usually VersionInfo + information about svn revision, operating system, etc. 52 /// Server version information. Usually VersionInfo + information about svn revision, operating system, etc.
53 /// </summary> 53 /// </summary>
@@ -66,19 +66,19 @@ namespace OpenSim.Framework.Servers
66 66
67 public BaseOpenSimServer() 67 public BaseOpenSimServer()
68 { 68 {
69 m_startuptime = DateTime.Now; 69 m_startuptime = DateTime.Now;
70 m_version = VersionInfo.Version; 70 m_version = VersionInfo.Version;
71 } 71 }
72 72
73 /// <summary> 73 /// <summary>
74 /// Performs initialisation of the scene, such as loading configuration from disk. 74 /// Performs initialisation of the scene, such as loading configuration from disk.
75 /// </summary> 75 /// </summary>
76 public virtual void Startup() 76 public virtual void Startup()
77 { 77 {
78 m_log.Info("[STARTUP]: Beginning startup processing"); 78 m_log.Info("[STARTUP]: Beginning startup processing");
79 79
80 EnhanceVersionInformation(); 80 EnhanceVersionInformation();
81 81
82 m_log.Info("[STARTUP]: Version " + m_version + "\n"); 82 m_log.Info("[STARTUP]: Version " + m_version + "\n");
83 } 83 }
84 84
@@ -86,9 +86,9 @@ namespace OpenSim.Framework.Servers
86 /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing 86 /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
87 /// </summary> 87 /// </summary>
88 public virtual void Shutdown() 88 public virtual void Shutdown()
89 { 89 {
90 m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting..."); 90 m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete. Exiting...");
91 91
92 Environment.Exit(0); 92 Environment.Exit(0);
93 } 93 }
94 94
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Servers
110 Notice("show uptime - show server startup time and uptime."); 110 Notice("show uptime - show server startup time and uptime.");
111 Notice("show version - show server version."); 111 Notice("show version - show server version.");
112 Notice("shutdown - shutdown the server.\n"); 112 Notice("shutdown - shutdown the server.\n");
113 113
114 break; 114 break;
115 115
116 case "show": 116 case "show":
@@ -146,10 +146,10 @@ namespace OpenSim.Framework.Servers
146 Notice("Server has been running since " + m_startuptime.DayOfWeek + ", " + m_startuptime.ToString()); 146 Notice("Server has been running since " + m_startuptime.DayOfWeek + ", " + m_startuptime.ToString());
147 Notice("That is an elapsed time of " + (DateTime.Now - m_startuptime).ToString()); 147 Notice("That is an elapsed time of " + (DateTime.Now - m_startuptime).ToString());
148 break; 148 break;
149 149
150 case "version": 150 case "version":
151 m_console.Notice("This is " + m_version); 151 m_console.Notice("This is " + m_version);
152 break; 152 break;
153 } 153 }
154 } 154 }
155 155
@@ -172,7 +172,7 @@ namespace OpenSim.Framework.Servers
172 protected void EnhanceVersionInformation() 172 protected void EnhanceVersionInformation()
173 { 173 {
174 string buildVersion = string.Empty; 174 string buildVersion = string.Empty;
175 175
176 // Add subversion revision information if available 176 // Add subversion revision information if available
177 // FIXME: Making an assumption about the directory we're currently in - we do this all over the place 177 // FIXME: Making an assumption about the directory we're currently in - we do this all over the place
178 // elsewhere as well 178 // elsewhere as well
@@ -227,6 +227,6 @@ namespace OpenSim.Framework.Servers
227 } 227 }
228 228
229 m_version += ", OS " + OSString; 229 m_version += ", OS " + OSString;
230 } 230 }
231 } 231 }
232} 232}
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 4994fd4..1105242 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Framework
90 // see IXmlSerializable 90 // see IXmlSerializable
91 public void ReadXml(XmlReader reader) 91 public void ReadXml(XmlReader reader)
92 { 92 {
93 // m_log.DebugFormat("[TASK INVENTORY]: ReadXml current node before actions, {0}", reader.Name); 93 // m_log.DebugFormat("[TASK INVENTORY]: ReadXml current node before actions, {0}", reader.Name);
94 94
95 if (!reader.IsEmptyElement) 95 if (!reader.IsEmptyElement)
96 { 96 {
@@ -114,7 +114,7 @@ namespace OpenSim.Framework
114 // of the element wrapping this object so that the rest of the serialization can complete normally. 114 // of the element wrapping this object so that the rest of the serialization can complete normally.
115 reader.Read(); 115 reader.Read();
116 116
117 // m_log.DebugFormat("[TASK INVENTORY]: ReadXml current node after actions, {0}", reader.Name); 117 // m_log.DebugFormat("[TASK INVENTORY]: ReadXml current node after actions, {0}", reader.Name);
118 } 118 }
119 119
120 // see IXmlSerializable 120 // see IXmlSerializable