aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs4
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs5
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs3
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs1
-rw-r--r--OpenSim/Grid/GridServer/Program.cs1
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs7
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs3
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs10
-rw-r--r--OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/PresenceInformer.cs2
-rw-r--r--OpenSim/Grid/MessagingServer/PresenceService.cs4
-rw-r--r--OpenSim/Grid/MessagingServer/UserManager.cs8
-rw-r--r--OpenSim/Grid/MessagingServer/XMPPHTTPService.cs3
-rw-r--r--OpenSim/Grid/UserServer/Main.cs3
-rw-r--r--OpenSim/Grid/UserServer/MessageServersConnector.cs4
-rw-r--r--OpenSim/Grid/UserServer/OpenIdService.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs2
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs2
19 files changed, 21 insertions, 47 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 4609ee8..5b23d5a 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -28,15 +28,15 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse;
32using log4net; 31using log4net;
33using log4net.Config; 32using log4net.Config;
33using OpenMetaverse;
34using OpenSim.Data;
34using OpenSim.Framework; 35using OpenSim.Framework;
35using OpenSim.Framework.AssetLoader.Filesystem; 36using OpenSim.Framework.AssetLoader.Filesystem;
36using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
38using OpenSim.Framework.Statistics; 39using OpenSim.Framework.Statistics;
39using OpenSim.Data;
40 40
41namespace OpenSim.Grid.AssetServer 41namespace OpenSim.Grid.AssetServer
42{ 42{
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index a44af6c..ba62c55 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -27,17 +27,16 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Net;
31using System.Reflection; 30using System.Reflection;
32using System.Text; 31using System.Text;
33using System.Xml; 32using System.Xml;
34using System.Xml.Serialization; 33using System.Xml.Serialization;
35using OpenMetaverse;
36using log4net; 34using log4net;
35using OpenMetaverse;
36using OpenSim.Data;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Framework.Statistics; 39using OpenSim.Framework.Statistics;
40using OpenSim.Data;
41 40
42namespace OpenSim.Grid.AssetServer 41namespace OpenSim.Grid.AssetServer
43{ 42{
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index f98809d..5dc186c 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -26,15 +26,14 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Text;
30using System.Collections; 29using System.Collections;
31using System.Collections.Generic; 30using System.Collections.Generic;
32using System.IO; 31using System.IO;
33using System.Reflection; 32using System.Reflection;
34using System.Xml; 33using System.Xml;
35using OpenMetaverse;
36using log4net; 34using log4net;
37using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenMetaverse;
38using OpenSim.Data; 37using OpenSim.Data;
39using OpenSim.Framework; 38using OpenSim.Framework;
40using OpenSim.Framework.Communications; 39using OpenSim.Framework.Communications;
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 9cc25e8..bcd1403 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -25,7 +25,6 @@
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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.IO; 29using System.IO;
31using System.Reflection; 30using System.Reflection;
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index 0032922..3b3bb42 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -25,7 +25,6 @@
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;
29using log4net.Config; 28using log4net.Config;
30 29
31namespace OpenSim.Grid.GridServer 30namespace OpenSim.Grid.GridServer
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 78d9f65..16d8154 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -28,14 +28,11 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection;
32using System.Threading;
33using System.Net; 31using System.Net;
34 32using System.Reflection;
35using OpenMetaverse;
36using log4net; 33using log4net;
37using Nwc.XmlRpc; 34using Nwc.XmlRpc;
38 35using OpenMetaverse;
39using OpenSim.Framework; 36using OpenSim.Framework;
40using OpenSim.Framework.Communications; 37using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 38using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 862ae58..8ca7c3d 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -29,9 +29,9 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
34using log4net.Config; 33using log4net.Config;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 13f52ab..2f63ee9 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -28,12 +28,9 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using OpenMetaverse;
32using log4net; 31using log4net;
33using log4net.Config; 32using log4net.Config;
34
35using OpenSim.Framework; 33using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
38using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
39 36
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index 7a4a47f..36f8b91 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -29,13 +29,15 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Threading;
33using System.Reflection; 32using System.Reflection;
34using OpenMetaverse; 33using System.Threading;
34using System.Timers;
35using log4net; 35using log4net;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenMetaverse;
37using OpenSim.Data; 38using OpenSim.Data;
38using OpenSim.Framework; 39using OpenSim.Framework;
40using Timer=System.Timers.Timer;
39 41
40namespace OpenSim.Grid.MessagingServer 42namespace OpenSim.Grid.MessagingServer
41{ 43{
@@ -52,7 +54,7 @@ namespace OpenSim.Grid.MessagingServer
52 // a dictionary of all current regions this server knows about 54 // a dictionary of all current regions this server knows about
53 private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong,RegionProfileData>(); 55 private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong,RegionProfileData>();
54 56
55 private System.Timers.Timer reconnectTimer = new System.Timers.Timer(300000); // 5 mins 57 private Timer reconnectTimer = new Timer(300000); // 5 mins
56 58
57 public MessageService(MessageServerConfig cfg) 59 public MessageService(MessageServerConfig cfg)
58 { 60 {
@@ -502,7 +504,7 @@ namespace OpenSim.Grid.MessagingServer
502 return regionProfile; 504 return regionProfile;
503 } 505 }
504 506
505 public void registerWithUserServer(object sender, System.Timers.ElapsedEventArgs e) 507 public void registerWithUserServer(object sender, ElapsedEventArgs e)
506 { 508 {
507 registerWithUserServer(); 509 registerWithUserServer();
508 } 510 }
diff --git a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
index 7ea1ac7..08566bb 100644
--- a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
@@ -25,9 +25,7 @@
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;
29using System.Collections.Generic; 28using System.Collections.Generic;
30using System.Text;
31using OpenMetaverse; 29using OpenMetaverse;
32 30
33namespace OpenSim.Grid.MessagingServer 31namespace OpenSim.Grid.MessagingServer
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
index 39fcadb..20342ab 100644
--- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs
@@ -26,8 +26,8 @@
26 */ 26 */
27 27
28using System.Collections; 28using System.Collections;
29using System.Reflection;
30using System.Net; 29using System.Net;
30using System.Reflection;
31using log4net; 31using log4net;
32using Nwc.XmlRpc; 32using Nwc.XmlRpc;
33using OpenSim.Data; 33using OpenSim.Data;
diff --git a/OpenSim/Grid/MessagingServer/PresenceService.cs b/OpenSim/Grid/MessagingServer/PresenceService.cs
index df5f687..d8cb755 100644
--- a/OpenSim/Grid/MessagingServer/PresenceService.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceService.cs
@@ -25,10 +25,6 @@
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;
29using System.Collections.Generic;
30using System.Text;
31
32namespace OpenSim.Grid.MessagingServer 28namespace OpenSim.Grid.MessagingServer
33{ 29{
34 class PresenceService 30 class PresenceService
diff --git a/OpenSim/Grid/MessagingServer/UserManager.cs b/OpenSim/Grid/MessagingServer/UserManager.cs
index fc8f703..4b07df7 100644
--- a/OpenSim/Grid/MessagingServer/UserManager.cs
+++ b/OpenSim/Grid/MessagingServer/UserManager.cs
@@ -25,17 +25,9 @@
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;
29using System.Collections;
30using System.Collections.Generic;
31using System.Reflection;
32using System.Text.RegularExpressions;
33using OpenMetaverse; 28using OpenMetaverse;
34using log4net;
35using Nwc.XmlRpc;
36using OpenSim.Framework; 29using OpenSim.Framework;
37using OpenSim.Framework.Communications; 30using OpenSim.Framework.Communications;
38using OpenSim.Framework.Servers;
39 31
40namespace OpenSim.Grid.MessagingServer 32namespace OpenSim.Grid.MessagingServer
41{ 33{
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index 9d3f2bf..87647cd 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -27,10 +27,9 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Net;
31using System.Reflection; 30using System.Reflection;
32using OpenMetaverse;
33using log4net; 31using log4net;
32using OpenMetaverse;
34using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
35 34
36namespace OpenSim.Grid.MessagingServer 35namespace OpenSim.Grid.MessagingServer
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index dd3f0b7..3f75838 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -28,11 +28,10 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net;
32using System.Reflection; 31using System.Reflection;
33using OpenMetaverse;
34using log4net; 32using log4net;
35using log4net.Config; 33using log4net.Config;
34using OpenMetaverse;
36using OpenSim.Framework; 35using OpenSim.Framework;
37using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
38using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 6da67d7..8d16109 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -29,12 +29,12 @@ using System.Collections;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse; 32using System.Threading;
33using log4net; 33using log4net;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenMetaverse;
35using OpenSim.Framework; 36using OpenSim.Framework;
36using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
37using System.Threading;
38 38
39namespace OpenSim.Grid.UserServer 39namespace OpenSim.Grid.UserServer
40{ 40{
diff --git a/OpenSim/Grid/UserServer/OpenIdService.cs b/OpenSim/Grid/UserServer/OpenIdService.cs
index 78e820e..187758f 100644
--- a/OpenSim/Grid/UserServer/OpenIdService.cs
+++ b/OpenSim/Grid/UserServer/OpenIdService.cs
@@ -31,10 +31,8 @@ using System.Collections.Specialized;
31using System.IO; 31using System.IO;
32using System.Net; 32using System.Net;
33using System.Web; 33using System.Web;
34using System.Text;
35using DotNetOpenId; 34using DotNetOpenId;
36using DotNetOpenId.Provider; 35using DotNetOpenId.Provider;
37using log4net;
38using OpenSim.Framework; 36using OpenSim.Framework;
39using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
40 38
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 0caefb1..905f4aa 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -30,9 +30,9 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using OpenMetaverse;
34using log4net; 33using log4net;
35using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenMetaverse;
36using OpenSim.Data; 36using OpenSim.Data;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 65e19b2..4da5f2e 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,9 +29,9 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using OpenMetaverse;
33using log4net; 32using log4net;
34using Nwc.XmlRpc; 33using Nwc.XmlRpc;
34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;