ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Spring cleaning on Region.Environment.

Browse Source 
* Converted a large number of read-only fields to be actually, readonly.
* Reformatted code sections.
* Removed redundant code.
This commit is contained in:
Adam Frisby
2008-05-01 16:35:00 +00:00
parent 01f31fd933
commit 13526097f2
76 changed files with 4181 additions and 4314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
OpenSim/Region/Environment/Scenes/SceneBase.cs
View File

@@ -40,6 +40,11 @@ namespace OpenSim.Region.Environment.Scenes
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// XXX These two methods are very temporary
/// </summary>
protected Dictionary<LLUUID, string> capsPaths = new Dictionary<LLUUID, string>();
#region Events
public event restart OnRestart;
@@ -50,41 +55,38 @@ namespace OpenSim.Region.Environment.Scenes
private readonly ClientManager m_clientManager = new ClientManager();
public ClientManager ClientManager
{
get { return m_clientManager; }
}
protected ulong m_regionHandle;
protected string m_regionName;
protected RegionInfo m_regInfo;
//public TerrainEngine Terrain;
public ITerrainChannel Heightmap;
public ILandChannel LandChannel;
private AssetCache m_assetCache;
protected string m_datastore;
protected EventManager m_eventManager;
private uint m_nextLocalId = 8880000;
protected RegionInfo m_regInfo;
protected ulong m_regionHandle;
protected string m_regionName;
protected RegionStatus m_regStatus;
public EventManager EventManager
{
get { return m_eventManager; }
}
protected string m_datastore;
private uint m_nextLocalId = 8880000;
private AssetCache m_assetCache;
public AssetCache AssetCache
{
get { return m_assetCache; }
set { m_assetCache = value; }
}
protected RegionStatus m_regStatus;
public ClientManager ClientManager
{
get { return m_clientManager; }
}
public RegionStatus Region_Status
{
@@ -141,6 +143,8 @@ namespace OpenSim.Region.Environment.Scenes
#endregion
#region IScene Members
/// <summary>
///
/// </summary>
@@ -155,6 +159,18 @@ namespace OpenSim.Region.Environment.Scenes
get { return m_nextLocalId++; }
}
public string GetCapsPath(LLUUID agentId)
{
if (capsPaths.ContainsKey(agentId))
{
return capsPaths[agentId];
}
return null;
}
#endregion
#region admin stuff
/// <summary>
@@ -173,6 +189,7 @@ namespace OpenSim.Region.Environment.Scenes
{
return false;
}
public abstract bool OtherRegionUp(RegionInfo thisRegion);
public virtual string GetSimulatorVersion()
@@ -195,24 +212,10 @@ namespace OpenSim.Region.Environment.Scenes
}
catch (Exception e)
{
m_log.Error("[SCENE]: SceneBase.cs: Close() - Failed with exception " + e.ToString());
m_log.Error("[SCENE]: SceneBase.cs: Close() - Failed with exception " + e);
}
}
#endregion
/// <summary>
/// XXX These two methods are very temporary
/// </summary>
protected Dictionary<LLUUID, string> capsPaths = new Dictionary<LLUUID, string>();
public string GetCapsPath(LLUUID agentId)
{
if (capsPaths.ContainsKey(agentId))
{
return capsPaths[agentId];
}
return null;
}
}
}
}