diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs (renamed from OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateModule.cs (renamed from OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs (renamed from OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs) | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs index e56bd95..ad561fd 100644 --- a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs | |||
@@ -45,11 +45,11 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
45 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | protected XEstateModule m_EstateModule; | 48 | protected EstateModule m_EstateModule; |
49 | private string token; | 49 | private string token; |
50 | uint port = 0; | 50 | uint port = 0; |
51 | 51 | ||
52 | public EstateConnector(XEstateModule module, string _token, uint _port) | 52 | public EstateConnector(EstateModule module, string _token, uint _port) |
53 | { | 53 | { |
54 | m_EstateModule = module; | 54 | m_EstateModule = module; |
55 | token = _token; | 55 | token = _token; |
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs index f9438fe..8eb38c2 100644 --- a/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateModule.cs | |||
@@ -45,7 +45,7 @@ using Mono.Addins; | |||
45 | namespace OpenSim.Region.CoreModules.World.Estate | 45 | namespace OpenSim.Region.CoreModules.World.Estate |
46 | { | 46 | { |
47 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XEstate")] | 47 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XEstate")] |
48 | public class XEstateModule : ISharedRegionModule | 48 | public class EstateModule : ISharedRegionModule |
49 | { | 49 | { |
50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
51 | 51 | ||
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs index 756b54d..7ab92d1 100644 --- a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs | |||
@@ -46,11 +46,11 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
46 | { | 46 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | protected XEstateModule m_EstateModule; | 49 | protected EstateModule m_EstateModule; |
50 | protected Object m_RequestLock = new Object(); | 50 | protected Object m_RequestLock = new Object(); |
51 | private string token; | 51 | private string token; |
52 | 52 | ||
53 | public EstateRequestHandler(XEstateModule fmodule, string _token) | 53 | public EstateRequestHandler(EstateModule fmodule, string _token) |
54 | : base("POST", "/estate") | 54 | : base("POST", "/estate") |
55 | { | 55 | { |
56 | m_EstateModule = fmodule; | 56 | m_EstateModule = fmodule; |