aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorMelanie Thielker2009-05-04 20:15:39 +0000
committerMelanie Thielker2009-05-04 20:15:39 +0000
commitacfb5051cd328ab21aba5bfc2878ce84d496a7f1 (patch)
treee828f8688de36d91c1917a02b651939580168125 /OpenSim/ApplicationPlugins
parent* Resolve http://opensimulator.org/mantis/view.php?id=3573 (diff)
downloadopensim-SC_OLD-acfb5051cd328ab21aba5bfc2878ce84d496a7f1.zip
opensim-SC_OLD-acfb5051cd328ab21aba5bfc2878ce84d496a7f1.tar.gz
opensim-SC_OLD-acfb5051cd328ab21aba5bfc2878ce84d496a7f1.tar.bz2
opensim-SC_OLD-acfb5051cd328ab21aba5bfc2878ce84d496a7f1.tar.xz
Intermediate commit. WILL NOT COMPILE!
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs1
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs1
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs1
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs1
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs1
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestFileServices.cs1
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs1
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs1
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs1
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs1
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs3
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestPlugin.cs4
14 files changed, 16 insertions, 5 deletions
diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
index 84e5db5..39c0066 100644
--- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs
@@ -36,6 +36,7 @@ using OpenSim.Framework.Communications.Services;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Communications.Osp; 37using OpenSim.Framework.Communications.Osp;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
39using OpenSim.Framework.Servers.HttpServer;
39using OpenSim.Region.Communications.Hypergrid; 40using OpenSim.Region.Communications.Hypergrid;
40using OpenSim.Region.Communications.Local; 41using OpenSim.Region.Communications.Local;
41using OpenSim.Region.Communications.OGS1; 42using OpenSim.Region.Communications.OGS1;
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index ecdbb52..e14843b 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -41,6 +41,7 @@ using OpenSim.Framework;
41using OpenSim.Framework.Communications.Cache; 41using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Console; 42using OpenSim.Framework.Console;
43using OpenSim.Framework.Servers; 43using OpenSim.Framework.Servers;
44using OpenSim.Framework.Servers.HttpServer;
44using OpenSim.Region.CoreModules.World.Terrain; 45using OpenSim.Region.CoreModules.World.Terrain;
45using OpenSim.Region.Framework.Interfaces; 46using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Framework.Scenes; 47using OpenSim.Region.Framework.Scenes;
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
index b27f9c5..510eee7 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/IRestHandler.cs
@@ -25,7 +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 OpenSim.Framework.Servers; 28using OpenSim.Framework.Servers.HttpServer;
29 29
30namespace OpenSim.ApplicationPlugins.Rest.Inventory 30namespace OpenSim.ApplicationPlugins.Rest.Inventory
31{ 31{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
index 9a8aef0..0c3cf73 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RequestData.cs
@@ -34,6 +34,7 @@ using System.Text.RegularExpressions;
34using System.Xml; 34using System.Xml;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Framework.Servers.HttpServer;
37 38
38namespace OpenSim.ApplicationPlugins.Rest.Inventory 39namespace OpenSim.ApplicationPlugins.Rest.Inventory
39{ 40{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index fad0438..7d9d8a5 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -31,6 +31,7 @@ using System.Xml;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
34using OpenSim.Framework.Servers.HttpServer;
34 35
35namespace OpenSim.ApplicationPlugins.Rest.Inventory 36namespace OpenSim.ApplicationPlugins.Rest.Inventory
36{ 37{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
index 043fca8..77c14c6 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
@@ -30,6 +30,7 @@ using System.Xml;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
33using OpenSim.Framework.Servers.HttpServer;
33 34
34namespace OpenSim.ApplicationPlugins.Rest.Inventory 35namespace OpenSim.ApplicationPlugins.Rest.Inventory
35{ 36{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestFileServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestFileServices.cs
index 94a786e..a2f5d45 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestFileServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestFileServices.cs
@@ -31,6 +31,7 @@ using System.IO;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
34using OpenSim.Framework.Servers.HttpServer;
34 35
35namespace OpenSim.ApplicationPlugins.Rest.Inventory 36namespace OpenSim.ApplicationPlugins.Rest.Inventory
36{ 37{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
index 180d6f4..7d539e0 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
32using OpenSim.Framework.Servers.Interfaces; 32using OpenSim.Framework.Servers.HttpServer;
33 33
34namespace OpenSim.ApplicationPlugins.Rest.Inventory 34namespace OpenSim.ApplicationPlugins.Rest.Inventory
35{ 35{
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
index f0d9946..ae242bd 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -38,6 +38,7 @@ using OpenMetaverse.Imaging;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
41using OpenSim.Framework.Servers.HttpServer;
41using Timer=System.Timers.Timer; 42using Timer=System.Timers.Timer;
42 43
43namespace OpenSim.ApplicationPlugins.Rest.Inventory 44namespace OpenSim.ApplicationPlugins.Rest.Inventory
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
index 1e87996..b2b11af 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
@@ -30,6 +30,7 @@ using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
33using OpenSim.Framework.Servers.HttpServer;
33 34
34namespace OpenSim.ApplicationPlugins.Rest.Inventory 35namespace OpenSim.ApplicationPlugins.Rest.Inventory
35{ 36{
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
index 8b22c16..3fc7c06 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETHandler.cs
@@ -30,6 +30,7 @@ using System.IO;
30using System.Xml.Serialization; 30using System.Xml.Serialization;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
33using OpenSim.Framework.Servers.HttpServer;
33using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
35 36
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs
index bd0089c..b49c5e9 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/GETRegionInfoHandler.cs
@@ -30,6 +30,7 @@ using System.IO;
30using System.Xml.Serialization; 30using System.Xml.Serialization;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers;
33using OpenSim.Framework.Servers.HttpServer;
33using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
35 36
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
index c689daa..4b8bb5c 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/POSTHandler.cs
@@ -29,6 +29,7 @@ using System;
29using System.IO; 29using System.IO;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
32using OpenSim.Framework.Servers.HttpServer;
32using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
34 35
@@ -116,4 +117,4 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
116 117
117 #endregion POST methods 118 #endregion POST methods
118 } 119 }
119} \ No newline at end of file 120}
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index 727ccfe..8af1276 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -35,7 +35,7 @@ using Nini.Config;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Servers.Interfaces; 38using OpenSim.Framework.Servers.HttpServer;
39 39
40namespace OpenSim.ApplicationPlugins.Rest 40namespace OpenSim.ApplicationPlugins.Rest
41{ 41{
@@ -412,4 +412,4 @@ namespace OpenSim.ApplicationPlugins.Rest
412 412
413 #endregion methods 413 #endregion methods
414 } 414 }
415} \ No newline at end of file 415}
generated by cgit v1.1 at 2024-11-09 07:12:29 +0000