aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2014-05-30 13:11:46 -0700
committerDiva Canto2014-05-30 13:11:46 -0700
commit0eede1467f4807de3ad84673ba524f1e99de6b72 (patch)
treea5ace60fe475a8a05d659dae9e2c790878383014 /OpenSim
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-0eede1467f4807de3ad84673ba524f1e99de6b72.zip
opensim-SC_OLD-0eede1467f4807de3ad84673ba524f1e99de6b72.tar.gz
opensim-SC_OLD-0eede1467f4807de3ad84673ba524f1e99de6b72.tar.bz2
opensim-SC_OLD-0eede1467f4807de3ad84673ba524f1e99de6b72.tar.xz
Moved these two estate-related interfaces to the projects where they belong.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/IEstateDataStore.cs (renamed from OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs)2
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs1
-rw-r--r--OpenSim/Services/Connectors/Simulation/EstateDataService.cs4
-rw-r--r--OpenSim/Services/Interfaces/IEstateDataService.cs (renamed from OpenSim/Region/Framework/Interfaces/IEstateDataService.cs)2
-rw-r--r--OpenSim/Tests/Common/Mock/TestScene.cs1
5 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs b/OpenSim/Data/IEstateDataStore.cs
index 8febb13..f9070ea 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs
+++ b/OpenSim/Data/IEstateDataStore.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Framework; 30using OpenSim.Framework;
31 31
32namespace OpenSim.Region.Framework.Interfaces 32namespace OpenSim.Data
33{ 33{
34 public interface IEstateDataStore 34 public interface IEstateDataStore
35 { 35 {
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 1ce166e..c497b1c 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -39,6 +39,7 @@ using OpenSim.Region.Framework;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Physics.Manager; 41using OpenSim.Region.Physics.Manager;
42using OpenSim.Services.Interfaces;
42 43
43namespace OpenSim.Region.ClientStack 44namespace OpenSim.Region.ClientStack
44{ 45{
diff --git a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
index cdcdecf..5962b99 100644
--- a/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
+++ b/OpenSim/Services/Connectors/Simulation/EstateDataService.cs
@@ -36,8 +36,8 @@ using OpenSim.Services.Base;
36using OpenSim.Services.Interfaces; 36using OpenSim.Services.Interfaces;
37using OpenSim.Data; 37using OpenSim.Data;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Region.Framework.Interfaces; 39//using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40//using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Services.Connectors 42namespace OpenSim.Services.Connectors
43{ 43{
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateDataService.cs b/OpenSim/Services/Interfaces/IEstateDataService.cs
index 35cc220..719563d 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateDataService.cs
+++ b/OpenSim/Services/Interfaces/IEstateDataService.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenMetaverse; 31using OpenMetaverse;
32 32
33namespace OpenSim.Region.Framework.Interfaces 33namespace OpenSim.Services.Interfaces
34{ 34{
35 public interface IEstateDataService 35 public interface IEstateDataService
36 { 36 {
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index a7e0dfb..2773624 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -33,6 +33,7 @@ using OpenSim.Framework.Servers;
33using OpenSim.Region.Framework; 33using OpenSim.Region.Framework;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Services.Interfaces;
36 37
37namespace OpenSim.Tests.Common.Mock 38namespace OpenSim.Tests.Common.Mock
38{ 39{