OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename the files and classes from XEstate to Estate 

The names conflict with it's ancestor module and the code is nothing
like the out of core XEstateModule, so it should not be named the same.
melanie
Melanie Thielker 2017-01-05 17:59:21 +00:00
parent 40e982f6e7
commit e0a6691932
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs → OpenSim/Region/CoreModules/World/Estate/EstateConnector.cs
View File

@ -45,11 +45,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected XEstateModule m_EstateModule;
protected EstateModule m_EstateModule;
private string token;
uint port = 0;
public EstateConnector(XEstateModule module, string _token, uint _port)
public EstateConnector(EstateModule module, string _token, uint _port)
{
m_EstateModule = module;
token = _token;

2
OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs → OpenSim/Region/CoreModules/World/Estate/EstateModule.cs
View File

@ -45,7 +45,7 @@ using Mono.Addins;
namespace OpenSim.Region.CoreModules.World.Estate
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XEstate")]
public class XEstateModule : ISharedRegionModule
public class EstateModule : ISharedRegionModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);

4
OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs → OpenSim/Region/CoreModules/World/Estate/EstateRequestHandler.cs
View File

@ -46,11 +46,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected XEstateModule m_EstateModule;
protected EstateModule m_EstateModule;
protected Object m_RequestLock = new Object();
private string token;
public EstateRequestHandler(XEstateModule fmodule, string _token)
public EstateRequestHandler(EstateModule fmodule, string _token)
: base("POST", "/estate")
{
m_EstateModule = fmodule;