Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

1 files changed, 8 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 9b8a3ae..e8134cd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -51,6 +51,8 @@ namespace OpenSim.Region.Framework.Scenes
         #endregion
 
         #region Fields
+
+        public string Name { get { return RegionInfo.RegionName; } }
         
         public IConfigSource Config
         {
@@ -148,6 +150,11 @@ namespace OpenSim.Region.Framework.Scenes
 
         #endregion
 
+        public SceneBase(RegionInfo regInfo)
+        {
+            RegionInfo = regInfo;
+        }
+
         #region Update Methods
 
         /// <summary>
@@ -211,10 +218,7 @@ namespace OpenSim.Region.Framework.Scenes
         ///
         /// </summary>
         /// <returns></returns>
-        public virtual RegionInfo RegionInfo
-        {
-            get { return m_regInfo; }
-        }
+        public virtual RegionInfo RegionInfo { get; private set; }
 
         #region admin stuff