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

Remove unused Datastore parameter from RegionInfo (legacy from early 2008)

0.7.1-dev
Justin Clark-Casey (justincc) 2011-03-31 22:16:09 +01:00
parent f7ed7fc05d
commit 8022400bd4
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/RegionInfo.cs
View File

@ -347,7 +347,6 @@ namespace OpenSim.Framework
public bool commFailTF = false; public bool commFailTF = false;
public ConfigurationMember configMember; public ConfigurationMember configMember;
public string DataStore = String.Empty;
public string RegionFile = String.Empty; public string RegionFile = String.Empty;
public bool isSandbox = false; public bool isSandbox = false;
public bool Persistent = true; public bool Persistent = true;
@ -746,10 +745,6 @@ namespace OpenSim.Framework
m_regionLocX = Convert.ToUInt32(locationElements[0]); m_regionLocX = Convert.ToUInt32(locationElements[0]);
m_regionLocY = Convert.ToUInt32(locationElements[1]); m_regionLocY = Convert.ToUInt32(locationElements[1]);
// Datastore (is this implemented? Omitted from example!)
DataStore = config.GetString("Datastore", String.Empty);
// Internal IP // Internal IP
IPAddress address; IPAddress address;
@ -846,9 +841,6 @@ namespace OpenSim.Framework
string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY); string location = String.Format("{0},{1}", m_regionLocX, m_regionLocY);
config.Set("Location", location); config.Set("Location", location);
if (DataStore != String.Empty)
config.Set("Datastore", DataStore);
config.Set("InternalAddress", m_internalEndPoint.Address.ToString()); config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
config.Set("InternalPort", m_internalEndPoint.Port); config.Set("InternalPort", m_internalEndPoint.Port);
@ -1025,9 +1017,6 @@ namespace OpenSim.Framework
case "sim_location_y": case "sim_location_y":
m_regionLocY = (uint) configuration_result; m_regionLocY = (uint) configuration_result;
break; break;
case "datastore":
DataStore = (string) configuration_result;
break;
case "internal_ip_address": case "internal_ip_address":
IPAddress address = (IPAddress) configuration_result; IPAddress address = (IPAddress) configuration_result;
m_internalEndPoint = new IPEndPoint(address, 0); m_internalEndPoint = new IPEndPoint(address, 0);

1
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -563,7 +563,6 @@ namespace OpenSim.Region.Framework.Scenes
m_regInfo = regInfo; m_regInfo = regInfo;
m_regionHandle = m_regInfo.RegionHandle; m_regionHandle = m_regInfo.RegionHandle;
m_regionName = m_regInfo.RegionName; m_regionName = m_regInfo.RegionName;
m_datastore = m_regInfo.DataStore;
m_lastUpdate = Util.EnvironmentTickCount(); m_lastUpdate = Util.EnvironmentTickCount();
m_physicalPrim = physicalPrim; m_physicalPrim = physicalPrim;

2
OpenSim/Region/Framework/Scenes/SceneBase.cs
View File

@ -136,8 +136,6 @@ namespace OpenSim.Region.Framework.Scenes
get { return m_permissions; } get { return m_permissions; }
} }
protected string m_datastore;
/* Used by the loadbalancer plugin on GForge */ /* Used by the loadbalancer plugin on GForge */
protected RegionStatus m_regStatus; protected RegionStatus m_regStatus;
public RegionStatus RegionStatus public RegionStatus RegionStatus