aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorMW2007-10-29 21:46:25 +0000
committerMW2007-10-29 21:46:25 +0000
commit3d8219f6c7faa256d6a13ab7925f75d83af95b78 (patch)
treeea507efa88aa7e526575469a6ce913fdc0c0358e /OpenSim/Grid
parentFixed a bug in SQLAssetServer that only seemed to be a problem when running u... (diff)
downloadopensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.zip
opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.gz
opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.bz2
opensim-SC_OLD-3d8219f6c7faa256d6a13ab7925f75d83af95b78.tar.xz
as per the "Filesystem cleanup for OpenSim repository" mailing list thread. Have flattened the OpenSim.Framework project/namespace. The problem is that the namespace is still wrong as its "OpenSim.Framework" while the directory is "OpenSim\Framework\General" , so we need to decide if we change the directory or correct the namespace.
Note this has lead to a big flat project, but I think a lot of the files we most likely don't even use any longer. And others belong in other projects/namespaces anyway.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs6
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs2
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs4
-rw-r--r--OpenSim/Grid/GridServer/Main.cs4
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs4
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs2
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs2
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs6
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs4
10 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 542f87f..e7e5d27 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -33,13 +33,13 @@ using System.Reflection;
33using libsecondlife; 33using libsecondlife;
34using Nini.Config; 34using Nini.Config;
35 35
36using OpenSim.Framework.Types; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
38using OpenSim.Framework.Configuration; 38using OpenSim.Framework;
39using OpenSim.Framework.Console; 39using OpenSim.Framework.Console;
40using OpenSim.Framework.Interfaces; 40using OpenSim.Framework.Interfaces;
41using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
42using OpenSim.Framework.Utilities; 42using OpenSim.Framework;
43using OpenSim.Framework.Servers; 43using OpenSim.Framework.Servers;
44 44
45namespace OpenSim.Grid.AssetServer 45namespace OpenSim.Grid.AssetServer
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index e4f770d..6993019 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
5using System.Text; 5using System.Text;
6 6
7using libsecondlife; 7using libsecondlife;
8using OpenSim.Framework.Types; 8using OpenSim.Framework;
9using OpenSim.Framework.Servers; 9using OpenSim.Framework.Servers;
10using OpenSim.Framework.Interfaces; 10using OpenSim.Framework.Interfaces;
11using OpenSim.Framework.Console; 11using OpenSim.Framework.Console;
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 9800b74..8ac7d6a 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -36,9 +36,9 @@ using Nwc.XmlRpc;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37using OpenSim.Framework.Data; 37using OpenSim.Framework.Data;
38using OpenSim.Framework.Interfaces; 38using OpenSim.Framework.Interfaces;
39using OpenSim.Framework.Utilities; 39using OpenSim.Framework;
40 40
41using OpenSim.Framework.Configuration; 41using OpenSim.Framework;
42 42
43namespace OpenSim.Grid.GridServer 43namespace OpenSim.Grid.GridServer
44{ 44{
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 2015be5..ae1e244 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -34,8 +34,8 @@ using System.Timers;
34using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
35using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Framework.Configuration; 37using OpenSim.Framework;
38using OpenSim.Framework.Utilities; 38using OpenSim.Framework;
39 39
40using Timer=System.Timers.Timer; 40using Timer=System.Timers.Timer;
41 41
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index e5728fe..8e7b95e 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.Environment.Interfaces;
37using OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler; 37using OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler;
38using OpenSim.Region.ScriptEngine.Common; 38using OpenSim.Region.ScriptEngine.Common;
39using OpenSim.Framework.Console; 39using OpenSim.Framework.Console;
40using OpenSim.Framework.Utilities; 40using OpenSim.Framework;
41using System.Runtime.Remoting.Lifetime; 41using System.Runtime.Remoting.Lifetime;
42 42
43namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler 43namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
@@ -584,7 +584,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
584 584
585 public string llList2Key(List<string> src, int index) 585 public string llList2Key(List<string> src, int index)
586 { 586 {
587 //return OpenSim.Framework.Types.ToStringHyphenated(src[index]); 587 //return OpenSim.Framework.ToStringHyphenated(src[index]);
588 return src[index].ToString(); 588 return src[index].ToString();
589 } 589 }
590 590
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
index 9f18f7c..44ed123 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
@@ -30,7 +30,7 @@ using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using libsecondlife; 32using libsecondlife;
33using OpenSim.Framework.Interfaces; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Scenes.Scripting; 34using OpenSim.Region.Environment.Scenes.Scripting;
35 35
36namespace OpenSim.Grid.ScriptEngine.DotNetEngine 36namespace OpenSim.Grid.ScriptEngine.DotNetEngine
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index 478915b..82035ac 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
31using System.Text; 31using System.Text;
32using System.IO; 32using System.IO;
33using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
34using OpenSim.Framework.Utilities; 34using OpenSim.Framework;
35 35
36namespace OpenSim.Grid.ScriptServer 36namespace OpenSim.Grid.ScriptServer
37{ 37{
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index b8d9065..492f67f 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -34,8 +34,8 @@ using libsecondlife;
34using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
35using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Framework.Utilities; 37using OpenSim.Framework;
38using OpenSim.Framework.Configuration; 38using OpenSim.Framework;
39 39
40namespace OpenSim.Grid.UserServer 40namespace OpenSim.Grid.UserServer
41{ 41{
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 2aecfa2..1523f81 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -32,9 +32,9 @@ using System.Net;
32using Nwc.XmlRpc; 32using Nwc.XmlRpc;
33using OpenSim.Framework.Data; 33using OpenSim.Framework.Data;
34using OpenSim.Framework.UserManagement; 34using OpenSim.Framework.UserManagement;
35using OpenSim.Framework.Utilities; 35using OpenSim.Framework;
36using OpenSim.Framework.Configuration; 36using OpenSim.Framework;
37using OpenSim.Framework.Types; 37using OpenSim.Framework;
38using OpenSim.Framework.Console; 38using OpenSim.Framework.Console;
39 39
40namespace OpenSim.Grid.UserServer 40namespace OpenSim.Grid.UserServer
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 5db4901..2b2bf72 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.Net; 30using System.Net;
31using Nwc.XmlRpc; 31using Nwc.XmlRpc;
32using OpenSim.Framework.Types; 32using OpenSim.Framework;
33using OpenSim.Framework.UserManagement; 33using OpenSim.Framework.UserManagement;
34using OpenSim.Framework.Utilities; 34using OpenSim.Framework;
35using libsecondlife; 35using libsecondlife;
36 36
37namespace OpenSim.Grid.UserServer 37namespace OpenSim.Grid.UserServer