aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework
diff options
context:
space:
mode:
authorlbsa712009-02-12 09:53:12 +0000
committerlbsa712009-02-12 09:53:12 +0000
commit801da4346aeb3c08969c4845f5c595135a64470a (patch)
tree2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Region/CoreModules/Framework
parentThanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff)
downloadopensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.zip
opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz
opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2
opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz
* optimized usings.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs45
-rw-r--r--OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs12
-rw-r--r--OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs8
-rw-r--r--OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs16
4 files changed, 36 insertions, 45 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index e81466a..3999213 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -25,32 +25,23 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Net.Sockets; 32using System.Reflection;
33using System.Reflection; 33using System.Threading;
34using System.Threading; 34using log4net;
35using System.Xml; 35using Nini.Config;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenMetaverse.Packets; 37using OpenMetaverse.Packets;
38using OpenMetaverse.StructuredData; 38using OpenMetaverse.StructuredData;
39using log4net; 39using OpenSim.Framework;
40using Nini.Config; 40using OpenSim.Framework.Servers;
41using Nwc.XmlRpc; 41using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Framework; 42using OpenSim.Region.Framework.Scenes;
43using OpenSim.Framework.Communications.Cache; 43using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>;
44using OpenSim.Framework.Communications.Capabilities; 44using Caps=OpenSim.Framework.Communications.Capabilities.Caps;
45using OpenSim.Framework.Servers;
46using OpenSim.Region.Framework.Interfaces;
47using OpenSim.Region.Framework.Scenes;
48
49using OSD = OpenMetaverse.StructuredData.OSD;
50using OSDMap = OpenMetaverse.StructuredData.OSDMap;
51using OSDArray = OpenMetaverse.StructuredData.OSDArray;
52using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
53using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>;
54 45
55namespace OpenSim.Region.CoreModules.Framework.EventQueue 46namespace OpenSim.Region.CoreModules.Framework.EventQueue
56{ 47{
@@ -326,7 +317,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
326 m_scene.CommsManager.HttpServer.AddHTTPHandler( 317 m_scene.CommsManager.HttpServer.AddHTTPHandler(
327 capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2); 318 capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2);
328 319
329 Random rnd = new Random(System.Environment.TickCount); 320 Random rnd = new Random(Environment.TickCount);
330 lock (m_ids) 321 lock (m_ids)
331 { 322 {
332 if (!m_ids.ContainsKey(agentID)) 323 if (!m_ids.ContainsKey(agentID))
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
index 80f6fce..5590516 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
@@ -25,12 +25,12 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Net; 29using System.Net;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenMetaverse.Packets; 31using OpenMetaverse.Packets;
32using OpenMetaverse.StructuredData; 32using OpenMetaverse.StructuredData;
33 33
34namespace OpenSim.Region.CoreModules.Framework.EventQueue 34namespace OpenSim.Region.CoreModules.Framework.EventQueue
35{ 35{
36 public class EventQueueHelper 36 public class EventQueueHelper
diff --git a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
index fe29e0c..11d13b9 100644
--- a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Command.cs
@@ -25,10 +25,10 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Region.Framework.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31 31
32namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander 32namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
33{ 33{
34 /// <summary> 34 /// <summary>
diff --git a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
index cd905ab..d98a0f8 100644
--- a/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
+++ b/OpenSim/Region/CoreModules/Framework/InterfaceCommander/Commander.cs
@@ -25,14 +25,14 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Text; 31using System.Text;
32using log4net; 32using log4net;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35 35
36namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander 36namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
37{ 37{
38 /// <summary> 38 /// <summary>