58 files changed, 1187 insertions, 2753 deletions

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index e57aaa0..7e4a8e8 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -58,12 +58,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private static bool daload = false;
-        private static Object   rslock = new Object();
-        private static Object   SOLock = new Object();
+        private static bool m_defaultAvatarsLoaded = false;
+        private static Object   m_requestLock = new Object();
+        private static Object   m_saveOarLock = new Object();
 
-        private OpenSimBase m_app;
-        private IHttpServer m_httpd;
+        private OpenSimBase m_application;
+        private IHttpServer m_httpServer;
         private IConfig m_config;
         private IConfigSource m_configSource;
         private string m_requiredPassword = String.Empty;
@@ -115,8 +115,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     m_requiredPassword = m_config.GetString("access_password", String.Empty);
                     int port = m_config.GetInt("port", 0);
 
-                    m_app = openSim;
-                    m_httpd = MainServer.GetHttpServer((uint)port);
+                    m_application = openSim;
+                    m_httpServer = MainServer.GetHttpServer((uint)port);
 
                     Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>();
                     availableMethods["admin_create_region"] = XmlRpcCreateRegionMethod;
@@ -160,14 +160,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     {
                         foreach (string method in availableMethods.Keys)
                         {
-                            m_httpd.AddXmlRPCHandler(method, availableMethods[method], false);
+                            m_httpServer.AddXmlRPCHandler(method, availableMethods[method], false);
                         }
                     }
                     else
                     {
                         foreach (string enabledMethod in enabledMethods.Split('|'))
                         {
-                            m_httpd.AddXmlRPCHandler(enabledMethod, availableMethods[enabledMethod]);
+                            m_httpServer.AddXmlRPCHandler(enabledMethod, availableMethods[enabledMethod]);
                         }
                     }
                 }
@@ -180,7 +180,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         public void PostInitialise()
         {
-            if (!createDefaultAvatars())
+            if (!CreateDefaultAvatars())
             {
                 m_log.Info("[RADMIN]: Default avatars not loaded");
             }
@@ -196,7 +196,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 Hashtable requestData = (Hashtable) request.Params[0];
 
                 m_log.Info("[RADMIN]: Request to restart Region.");
-                checkStringParameters(request, new string[] {"password", "regionID"});
+                CheckStringParameters(request, new string[] {"password", "regionID"});
 
                 if (m_requiredPassword != String.Empty &&
                     (!requestData.Contains("password") || (string) requestData["password"] != m_requiredPassword))
@@ -212,7 +212,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 Scene rebootedScene;
 
-                if (!m_app.SceneManager.TryGetScene(regionID, out rebootedScene))
+                if (!m_application.SceneManager.TryGetScene(regionID, out rebootedScene))
                     throw new Exception("region not found");
 
                 responseData["rebooting"] = true;
@@ -245,7 +245,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             {
                 Hashtable requestData = (Hashtable) request.Params[0];
 
-                checkStringParameters(request, new string[] {"password", "message"});
+                CheckStringParameters(request, new string[] {"password", "message"});
 
                 if (m_requiredPassword != String.Empty &&
                     (!requestData.Contains("password") || (string) requestData["password"] != m_requiredPassword))
@@ -258,7 +258,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 responseData["success"] = true;
                 response.Value = responseData;
 
-                m_app.SceneManager.ForEachScene(
+                m_application.SceneManager.ForEachScene(
                     delegate(Scene scene)
                         {
                             IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
@@ -299,7 +299,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 //                       k, (string)requestData[k], ((string)requestData[k]).Length);
                 // }
 
-                checkStringParameters(request, new string[] {"password", "filename", "regionid"});
+                CheckStringParameters(request, new string[] {"password", "filename", "regionid"});
 
                 if (m_requiredPassword != String.Empty &&
                     (!requestData.Contains("password") || (string) requestData["password"] != m_requiredPassword))
@@ -313,7 +313,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 Scene region = null;
 
-                if (!m_app.SceneManager.TryGetScene(regionID, out region))
+                if (!m_application.SceneManager.TryGetScene(regionID, out region))
                     throw new Exception("1: unable to get a scene with that name");
 
                 ITerrainModule terrainModule = region.RequestModuleInterface<ITerrainModule>();
@@ -387,7 +387,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     message = "Region is going down now.";
                 }
 
-                m_app.SceneManager.ForEachScene(
+                m_application.SceneManager.ForEachScene(
                     delegate(Scene scene)
                         {
                             IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
@@ -422,7 +422,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         private void shutdownTimer_Elapsed(object sender, ElapsedEventArgs e)
         {
-            m_app.Shutdown();
+            m_application.Shutdown();
         }
 
         /// <summary>
@@ -489,7 +489,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (rslock)
+            lock (m_requestLock)
             {
                 int  m_regionLimit = m_config.GetInt("region_limit", 0);
                 bool m_enableVoiceForNewRegions = m_config.GetBoolean("create_region_enable_voice", false);
@@ -499,7 +499,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 {
                     Hashtable requestData = (Hashtable) request.Params[0];
 
-                    checkStringParameters(request, new string[]
+                    CheckStringParameters(request, new string[]
                                                        {
                                                            "password",
                                                            "region_name",
@@ -507,14 +507,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                                            "region_master_password",
                                                            "listen_ip", "external_address"
                                                        });
-                    checkIntegerParams(request, new string[] {"region_x", "region_y", "listen_port"});
+                    CheckIntegerParams(request, new string[] {"region_x", "region_y", "listen_port"});
 
                     // check password
                     if (!String.IsNullOrEmpty(m_requiredPassword) &&
                         (string) requestData["password"] != m_requiredPassword) throw new Exception("wrong password");
 
                     // check whether we still have space left (iff we are using limits)
-                    if (m_regionLimit != 0 && m_app.SceneManager.Scenes.Count >= m_regionLimit)
+                    if (m_regionLimit != 0 && m_application.SceneManager.Scenes.Count >= m_regionLimit)
                         throw new Exception(String.Format("cannot instantiate new region, server capacity {0} already reached; delete regions first",
                                                           m_regionLimit));
                     // extract or generate region ID now
@@ -524,7 +524,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         !String.IsNullOrEmpty((string) requestData["region_id"]))
                     {
                         regionID = (UUID) (string) requestData["region_id"];
-                        if (m_app.SceneManager.TryGetScene(regionID, out scene))
+                        if (m_application.SceneManager.TryGetScene(regionID, out scene))
                             throw new Exception(
                                 String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>",
                                               scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
@@ -547,13 +547,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     // check for collisions: region name, region UUID,
                     // region location
-                    if (m_app.SceneManager.TryGetScene(region.RegionName, out scene))
+                    if (m_application.SceneManager.TryGetScene(region.RegionName, out scene))
                         throw new Exception(
                             String.Format("region name already in use by region {0}, UUID {1}, <{2},{3}>",
                                           scene.RegionInfo.RegionName, scene.RegionInfo.RegionID,
                                           scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY));
 
-                    if (m_app.SceneManager.TryGetScene(region.RegionLocX, region.RegionLocY, out scene))
+                    if (m_application.SceneManager.TryGetScene(region.RegionLocX, region.RegionLocY, out scene))
                         throw new Exception(
                             String.Format("region location <{0},{1}> already in use by region {2}, UUID {3}, <{4},{5}>",
                                           region.RegionLocX, region.RegionLocY,
@@ -565,7 +565,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     region.InternalEndPoint.Port = Convert.ToInt32(requestData["listen_port"]);
                     if (0 == region.InternalEndPoint.Port) throw new Exception("listen_port is 0");
-                    if (m_app.SceneManager.TryGetScene(region.InternalEndPoint, out scene))
+                    if (m_application.SceneManager.TryGetScene(region.InternalEndPoint, out scene))
                         throw new Exception(
                             String.Format(
                                 "region internal IP {0} and port {1} already in use by region {2}, UUID {3}, <{4},{5}>",
@@ -625,28 +625,28 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     // Create the region and perform any initial initialization
 
-                    IScene newscene;
-                    m_app.CreateRegion(region, out newscene);
+                    IScene newScene;
+                    m_application.CreateRegion(region, out newScene);
 
                     // If an access specification was provided, use it.
                     // Otherwise accept the default.
-                    newscene.RegionInfo.EstateSettings.PublicAccess = getBoolean(requestData, "public", m_publicAccess);
-                    newscene.RegionInfo.EstateSettings.EstateOwner = userID;
+                    newScene.RegionInfo.EstateSettings.PublicAccess = GetBoolean(requestData, "public", m_publicAccess);
+                    newScene.RegionInfo.EstateSettings.EstateOwner = userID;
                     if (persist)
-                        newscene.RegionInfo.EstateSettings.Save();
+                        newScene.RegionInfo.EstateSettings.Save();
 
                     // enable voice on newly created region if
                     // requested by either the XmlRpc request or the
                     // configuration
-                    if (getBoolean(requestData, "enable_voice", m_enableVoiceForNewRegions))
+                    if (GetBoolean(requestData, "enable_voice", m_enableVoiceForNewRegions))
                     {
-                        List<ILandObject> parcels = ((Scene)newscene).LandChannel.AllParcels();
+                        List<ILandObject> parcels = ((Scene)newScene).LandChannel.AllParcels();
 
                         foreach (ILandObject parcel in parcels)
                         {
                             parcel.LandData.Flags |= (uint) ParcelFlags.AllowVoiceChat;
                             parcel.LandData.Flags |= (uint) ParcelFlags.UseEstateVoiceChan;
-                            ((Scene)newscene).LandChannel.UpdateLandObject(parcel.LandData.LocalID, parcel.LandData);
+                            ((Scene)newScene).LandChannel.UpdateLandObject(parcel.LandData.LocalID, parcel.LandData);
                         }
                     }
 
@@ -704,19 +704,19 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (rslock)
+            lock (m_requestLock)
             {
                 try
                 {
                     Hashtable requestData = (Hashtable) request.Params[0];
-                    checkStringParameters(request, new string[] {"password", "region_name"});
+                    CheckStringParameters(request, new string[] {"password", "region_name"});
 
                     Scene scene = null;
                     string regionName = (string) requestData["region_name"];
-                    if (!m_app.SceneManager.TryGetScene(regionName, out scene))
+                    if (!m_application.SceneManager.TryGetScene(regionName, out scene))
                         throw new Exception(String.Format("region \"{0}\" does not exist", regionName));
 
-                    m_app.RemoveRegion(scene, true);
+                    m_application.RemoveRegion(scene, true);
 
                     responseData["success"] = true;
                     responseData["region_name"] = regionName;
@@ -774,22 +774,22 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             Hashtable responseData = new Hashtable();
             Scene scene = null;
 
-            lock (rslock)
+            lock (m_requestLock)
             {
                 try
                 {
                     Hashtable requestData = (Hashtable) request.Params[0];
-                    checkStringParameters(request, new string[] {"password"});
+                    CheckStringParameters(request, new string[] {"password"});
 
                     if (requestData.ContainsKey("region_id") &&
                         !String.IsNullOrEmpty((string) requestData["region_id"]))
                     {
                         // Region specified by UUID
                         UUID regionID = (UUID) (string) requestData["region_id"];
-                        if (!m_app.SceneManager.TryGetScene(regionID, out scene))
+                        if (!m_application.SceneManager.TryGetScene(regionID, out scene))
                             throw new Exception(String.Format("region \"{0}\" does not exist", regionID));
 
-                        m_app.CloseRegion(scene);
+                        m_application.CloseRegion(scene);
 
                         responseData["success"] = true;
                         responseData["region_id"] = regionID;
@@ -802,10 +802,10 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         // Region specified by name
 
                         string regionName = (string) requestData["region_name"];
-                        if (!m_app.SceneManager.TryGetScene(regionName, out scene))
+                        if (!m_application.SceneManager.TryGetScene(regionName, out scene))
                             throw new Exception(String.Format("region \"{0}\" does not exist", regionName));
 
-                        m_app.CloseRegion(scene);
+                        m_application.CloseRegion(scene);
 
                         responseData["success"] = true;
                         responseData["region_name"] = regionName;
@@ -869,27 +869,27 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (rslock)
+            lock (m_requestLock)
             {
                 try
                 {
                     Hashtable requestData = (Hashtable) request.Params[0];
-                    checkStringParameters(request, new string[] {"password", "region_name"});
+                    CheckStringParameters(request, new string[] {"password", "region_name"});
 
                     Scene scene = null;
                     string regionName = (string) requestData["region_name"];
-                    if (!m_app.SceneManager.TryGetScene(regionName, out scene))
+                    if (!m_application.SceneManager.TryGetScene(regionName, out scene))
                         throw new Exception(String.Format("region \"{0}\" does not exist", regionName));
 
                     // Modify access
                     scene.RegionInfo.EstateSettings.PublicAccess =
-                        getBoolean(requestData,"public", scene.RegionInfo.EstateSettings.PublicAccess);
+                        GetBoolean(requestData,"public", scene.RegionInfo.EstateSettings.PublicAccess);
                     if (scene.RegionInfo.Persistent)
                         scene.RegionInfo.EstateSettings.Save();
 
                     if (requestData.ContainsKey("enable_voice"))
                     {
-                        bool enableVoice = getBoolean(requestData, "enable_voice", true);
+                        bool enableVoice = GetBoolean(requestData, "enable_voice", true);
                         List<ILandObject> parcels = ((Scene)scene).LandChannel.AllParcels();
 
                         foreach (ILandObject parcel in parcels)
@@ -976,66 +976,66 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (rslock)
+            lock (m_requestLock)
             {
                 try
                 {
                     Hashtable requestData = (Hashtable) request.Params[0];
 
                     // check completeness
-                    checkStringParameters(request, new string[]
+                    CheckStringParameters(request, new string[]
                                                        {
                                                            "password", "user_firstname",
                                                            "user_lastname", "user_password",
                                                        });
-                    checkIntegerParams(request, new string[] {"start_region_x", "start_region_y"});
+                    CheckIntegerParams(request, new string[] {"start_region_x", "start_region_y"});
 
                     // check password
                     if (!String.IsNullOrEmpty(m_requiredPassword) &&
                         (string) requestData["password"] != m_requiredPassword) throw new Exception("wrong password");
 
                     // do the job
-                    string firstname = (string) requestData["user_firstname"];
-                    string lastname = (string) requestData["user_lastname"];
-                    string passwd = (string) requestData["user_password"];
+                    string firstName = (string) requestData["user_firstname"];
+                    string lastName = (string) requestData["user_lastname"];
+                    string password = (string) requestData["user_password"];
 
-                    uint regX = Convert.ToUInt32((Int32) requestData["start_region_x"]);
-                    uint regY = Convert.ToUInt32((Int32) requestData["start_region_y"]);
+                    uint regionXLocation = Convert.ToUInt32((Int32) requestData["start_region_x"]);
+                    uint regionYLocation = Convert.ToUInt32((Int32) requestData["start_region_y"]);
 
                     string email = ""; // empty string for email
                     if (requestData.Contains("user_email"))
                         email = (string)requestData["user_email"];
 
-                    Scene scene = m_app.SceneManager.CurrentOrFirstScene;
+                    Scene scene = m_application.SceneManager.CurrentOrFirstScene;
                     UUID scopeID = scene.RegionInfo.ScopeID;
 
-                    UserAccount account = CreateUser(scopeID, firstname, lastname, passwd, email);
+                    UserAccount account = CreateUser(scopeID, firstName, lastName, password, email);
 
                     if (null == account)
                         throw new Exception(String.Format("failed to create new user {0} {1}",
-                                                          firstname, lastname));
+                                                          firstName, lastName));
 
                     // Set home position
 
                     GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 
-                        (int)(regX * Constants.RegionSize), (int)(regY * Constants.RegionSize));
+                        (int)(regionXLocation * Constants.RegionSize), (int)(regionYLocation * Constants.RegionSize));
                     if (null == home) {
-                        m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", firstname, lastname);
+                        m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", firstName, lastName);
                     } else {
                         scene.GridUserService.SetHome(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
-                        m_log.DebugFormat("[RADMIN]: Set home region {0} for updated user account {1} {2}", home.RegionID, firstname, lastname);
+                        m_log.DebugFormat("[RADMIN]: Set home region {0} for updated user account {1} {2}", home.RegionID, firstName, lastName);
                     }
 
                     // Establish the avatar's initial appearance
 
-                    updateUserAppearance(responseData, requestData, account.PrincipalID);
+                    UpdateUserAppearance(responseData, requestData, account.PrincipalID);
 
                     responseData["success"] = true;
                     responseData["avatar_uuid"] = account.PrincipalID.ToString();
 
                     response.Value = responseData;
 
-                    m_log.InfoFormat("[RADMIN]: CreateUser: User {0} {1} created, UUID {2}", firstname, lastname, account.PrincipalID);
+                    m_log.InfoFormat("[RADMIN]: CreateUser: User {0} {1} created, UUID {2}", firstName, lastName, account.PrincipalID);
                 }
                 catch (Exception e)
                 {
@@ -1099,17 +1099,17 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 Hashtable requestData = (Hashtable) request.Params[0];
 
                 // check completeness
-                checkStringParameters(request, new string[] {"password", "user_firstname", "user_lastname"});
+                CheckStringParameters(request, new string[] {"password", "user_firstname", "user_lastname"});
 
-                string firstname = (string) requestData["user_firstname"];
-                string lastname = (string) requestData["user_lastname"];
+                string firstName = (string) requestData["user_firstname"];
+                string lastName = (string) requestData["user_lastname"];
 
-                responseData["user_firstname"] = firstname;
-                responseData["user_lastname"] = lastname;
+                responseData["user_firstname"] = firstName;
+                responseData["user_lastname"] = lastName;
 
-                UUID scopeID = m_app.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
+                UUID scopeID = m_application.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
 
-                UserAccount account = m_app.SceneManager.CurrentOrFirstScene.UserAccountService.GetUserAccount(scopeID, firstname, lastname);
+                UserAccount account = m_application.SceneManager.CurrentOrFirstScene.UserAccountService.GetUserAccount(scopeID, firstName, lastName);
 
                 if (null == account)
                 {
@@ -1118,9 +1118,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
                 else
                 {
-                    GridUserInfo guinfo = m_app.SceneManager.CurrentOrFirstScene.GridUserService.GetGridUserInfo(account.PrincipalID.ToString());
-                    if (guinfo != null)
-                        responseData["lastlogin"] = guinfo.Login;
+                    GridUserInfo userInfo = m_application.SceneManager.CurrentOrFirstScene.GridUserService.GetGridUserInfo(account.PrincipalID.ToString());
+                    if (userInfo != null)
+                        responseData["lastlogin"] = userInfo.Login;
                     else
                         responseData["lastlogin"] = 0;
 
@@ -1197,14 +1197,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (rslock)
+            lock (m_requestLock)
             {
                 try
                 {
                     Hashtable requestData = (Hashtable) request.Params[0];
 
                     // check completeness
-                    checkStringParameters(request, new string[] {
+                    CheckStringParameters(request, new string[] {
                             "password", "user_firstname",
                             "user_lastname"});
 
@@ -1213,12 +1213,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         (string) requestData["password"] != m_requiredPassword) throw new Exception("wrong password");
 
                     // do the job
-                    string firstname = (string) requestData["user_firstname"];
-                    string lastname = (string) requestData["user_lastname"];
+                    string firstName = (string) requestData["user_firstname"];
+                    string lastName = (string) requestData["user_lastname"];
 
-                    string passwd = String.Empty;
-                    uint? regX = null;
-                    uint? regY = null;
+                    string password = String.Empty;
+                    uint? regionXLocation = null;
+                    uint? regionYLocation = null;
             //        uint? ulaX = null;
             //        uint? ulaY = null;
             //        uint? ulaZ = null;
@@ -1228,11 +1228,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             //        string aboutFirstLive = String.Empty;
             //        string aboutAvatar = String.Empty;
 
-                    if (requestData.ContainsKey("user_password")) passwd = (string) requestData["user_password"];
+                    if (requestData.ContainsKey("user_password")) password = (string) requestData["user_password"];
                     if (requestData.ContainsKey("start_region_x"))
-                        regX = Convert.ToUInt32((Int32) requestData["start_region_x"]);
+                        regionXLocation = Convert.ToUInt32((Int32) requestData["start_region_x"]);
                     if (requestData.ContainsKey("start_region_y"))
-                        regY = Convert.ToUInt32((Int32) requestData["start_region_y"]);
+                        regionYLocation = Convert.ToUInt32((Int32) requestData["start_region_y"]);
 
             //        if (requestData.ContainsKey("start_lookat_x"))
             //            ulaX = Convert.ToUInt32((Int32) requestData["start_lookat_x"]);
@@ -1252,17 +1252,17 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             //        if (requestData.ContainsKey("about_virtual_world"))
             //            aboutAvatar = (string)requestData["about_virtual_world"];
 
-                    Scene scene = m_app.SceneManager.CurrentOrFirstScene;
+                    Scene scene = m_application.SceneManager.CurrentOrFirstScene;
                     UUID scopeID = scene.RegionInfo.ScopeID;
-                    UserAccount account = scene.UserAccountService.GetUserAccount(scopeID, firstname, lastname);
+                    UserAccount account = scene.UserAccountService.GetUserAccount(scopeID, firstName, lastName);
 
                     if (null == account)
-                        throw new Exception(String.Format("avatar {0} {1} does not exist", firstname, lastname));
+                        throw new Exception(String.Format("avatar {0} {1} does not exist", firstName, lastName));
 
-                    if (!String.IsNullOrEmpty(passwd))
+                    if (!String.IsNullOrEmpty(password))
                     {
-                        m_log.DebugFormat("[RADMIN]: UpdateUserAccount: updating password for avatar {0} {1}", firstname, lastname);
-                        ChangeUserPassword(firstname, lastname, passwd);
+                        m_log.DebugFormat("[RADMIN]: UpdateUserAccount: updating password for avatar {0} {1}", firstName, lastName);
+                        ChangeUserPassword(firstName, lastName, password);
                     }
 
             //        if (null != usaX) userProfile.HomeLocationX = (uint) usaX;
@@ -1278,21 +1278,21 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     // Set home position
 
-                    if ((null != regX) && (null != regY))
+                    if ((null != regionXLocation) && (null != regionYLocation))
                     {
                         GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 
-                            (int)(regX * Constants.RegionSize), (int)(regY * Constants.RegionSize));
+                            (int)(regionXLocation * Constants.RegionSize), (int)(regionYLocation * Constants.RegionSize));
                         if (null == home) {
-                            m_log.WarnFormat("[RADMIN]: Unable to set home region for updated user account {0} {1}", firstname, lastname);
+                            m_log.WarnFormat("[RADMIN]: Unable to set home region for updated user account {0} {1}", firstName, lastName);
                         } else {
                             scene.GridUserService.SetHome(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
-                            m_log.DebugFormat("[RADMIN]: Set home region {0} for updated user account {1} {2}", home.RegionID, firstname, lastname);
+                            m_log.DebugFormat("[RADMIN]: Set home region {0} for updated user account {1} {2}", home.RegionID, firstName, lastName);
                         }
                     }
 
                     // User has been created. Now establish gender and appearance.
 
-                    updateUserAppearance(responseData, requestData, account.PrincipalID);
+                    UpdateUserAppearance(responseData, requestData, account.PrincipalID);
 
                     responseData["success"] = true;
                     responseData["avatar_uuid"] = account.PrincipalID.ToString();
@@ -1300,7 +1300,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     response.Value = responseData;
 
                     m_log.InfoFormat("[RADMIN]: UpdateUserAccount: account for user {0} {1} updated, UUID {2}",
-                                     firstname, lastname,
+                                     firstName, lastName,
                                      account.PrincipalID);
                 }
                 catch (Exception e)
@@ -1328,13 +1328,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         /// This should probably get moved into somewhere more core eventually.
         /// </summary>
 
-        private void updateUserAppearance(Hashtable responseData, Hashtable requestData, UUID userid)
+        private void UpdateUserAppearance(Hashtable responseData, Hashtable requestData, UUID userid)
         {
             m_log.DebugFormat("[RADMIN] updateUserAppearance");
 
-            string dmale   = m_config.GetString("default_male", "Default Male");
-            string dfemale = m_config.GetString("default_female", "Default Female");
-            string dneut   = m_config.GetString("default_female", "Default Default");
+            string defaultMale   = m_config.GetString("default_male", "Default Male");
+            string defaultFemale = m_config.GetString("default_female", "Default Female");
+            string defaultNeutral   = m_config.GetString("default_female", "Default Default");
             string model   = String.Empty;
 
             // Has a gender preference been supplied?
@@ -1345,16 +1345,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 {
                     case "m" :
                     case "male" :
-                        model = dmale;
+                        model = defaultMale;
                         break;
                     case "f" :
                     case "female" :
-                        model = dfemale;
+                        model = defaultFemale;
                         break;
                     case "n" :
                     case "neutral" :
                     default :
-                        model = dneut;
+                        model = defaultNeutral;
                         break;
                 }
             }
@@ -1376,19 +1376,19 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             m_log.DebugFormat("[RADMIN] Setting appearance for avatar {0}, using model <{1}>", userid, model);
 
-            string[] nomens = model.Split();
-            if (nomens.Length != 2)
+            string[] modelSpecifiers = model.Split();
+            if (modelSpecifiers.Length != 2)
             {
                 m_log.WarnFormat("[RADMIN] User appearance not set for {0}. Invalid model name : <{1}>", userid, model);
-                // nomens = dmodel.Split();
+                // modelSpecifiers = dmodel.Split();
                 return;
             }
 
-            Scene scene = m_app.SceneManager.CurrentOrFirstScene;
+            Scene scene = m_application.SceneManager.CurrentOrFirstScene;
             UUID scopeID = scene.RegionInfo.ScopeID;
-            UserAccount mprof = scene.UserAccountService.GetUserAccount(scopeID, nomens[0], nomens[1]);
+            UserAccount modelProfile = scene.UserAccountService.GetUserAccount(scopeID, modelSpecifiers[0], modelSpecifiers[1]);
 
-            if (mprof == null)
+            if (modelProfile == null)
             {
                 m_log.WarnFormat("[RADMIN] Requested model ({0}) not found. Appearance unchanged", model);
                 return;
@@ -1398,7 +1398,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             // actual asset ids, however to complete the magic we need to populate the inventory with the
             // assets in question.
 
-            establishAppearance(userid, mprof.PrincipalID);
+            EstablishAppearance(userid, modelProfile.PrincipalID);
 
             m_log.DebugFormat("[RADMIN] Finished setting appearance for avatar {0}, using model {1}",
                               userid, model);
@@ -1410,17 +1410,17 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         /// is known to exist, as is the target avatar.
         /// </summary>
 
-        private void establishAppearance(UUID dest, UUID srca)
+        private void EstablishAppearance(UUID destination, UUID source)
         {
-            m_log.DebugFormat("[RADMIN] Initializing inventory for {0} from {1}", dest, srca);
-            Scene scene = m_app.SceneManager.CurrentOrFirstScene;
-            AvatarAppearance ava = null;
-            AvatarData avatar = scene.AvatarService.GetAvatar(srca);
+            m_log.DebugFormat("[RADMIN] Initializing inventory for {0} from {1}", destination, source);
+            Scene scene = m_application.SceneManager.CurrentOrFirstScene;
+            AvatarAppearance avatarAppearance = null;
+            AvatarData avatar = scene.AvatarService.GetAvatar(source);
             if (avatar != null)
-                ava = avatar.ToAvatarAppearance(srca);
+                avatarAppearance = avatar.ToAvatarAppearance(source);
 
             // If the model has no associated appearance we're done.
-            if (ava == null)
+            if (avatarAppearance == null)
                 return;
 
             // Simple appearance copy or copy Clothing and Bodyparts folders?
@@ -1431,15 +1431,15 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 // Simple copy of wearables and appearance update
                 try
                 {
-                    copyWearablesAndAttachments(dest, srca, ava);
+                    CopyWearablesAndAttachments(destination, source, avatarAppearance);
 
-                    AvatarData adata = new AvatarData(ava);
-                    scene.AvatarService.SetAvatar(dest, adata);
+                    AvatarData avatarData = new AvatarData(avatarAppearance);
+                    scene.AvatarService.SetAvatar(destination, avatarData);
                 }
                 catch (Exception e)
                 {
                     m_log.WarnFormat("[RADMIN] Error transferring appearance for {0} : {1}",
-                                      dest, e.Message);
+                                      destination, e.Message);
                 }
 
                 return;
@@ -1448,30 +1448,30 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             // Copy Clothing and Bodypart folders and appearance update
             try
             {
-                Dictionary<UUID,UUID> imap = new Dictionary<UUID,UUID>();
-                copyInventoryFolders(dest, srca, AssetType.Clothing, imap, ava);
-                copyInventoryFolders(dest, srca, AssetType.Bodypart, imap, ava);
+                Dictionary<UUID,UUID> inventoryMap = new Dictionary<UUID,UUID>();
+                CopyInventoryFolders(destination, source, AssetType.Clothing, inventoryMap, avatarAppearance);
+                CopyInventoryFolders(destination, source, AssetType.Bodypart, inventoryMap, avatarAppearance);
 
-                AvatarWearable[] wearables = ava.Wearables;
+                AvatarWearable[] wearables = avatarAppearance.Wearables;
 
                 for (int i=0; i<wearables.Length; i++)
                 {
-                    if (imap.ContainsKey(wearables[i].ItemID))
+                    if (inventoryMap.ContainsKey(wearables[i].ItemID))
                     {
-                        AvatarWearable dw = new AvatarWearable();
-                        dw.AssetID = wearables[i].AssetID;
-                        dw.ItemID  = imap[wearables[i].ItemID];
-                        ava.SetWearable(i, dw);
+                        AvatarWearable wearable = new AvatarWearable();
+                        wearable.AssetID = wearables[i].AssetID;
+                        wearable.ItemID  = inventoryMap[wearables[i].ItemID];
+                        avatarAppearance.SetWearable(i, wearable);
                     }
                 }
 
-                AvatarData adata = new AvatarData(ava);
-                scene.AvatarService.SetAvatar(dest, adata);
+                AvatarData avatarData = new AvatarData(avatarAppearance);
+                scene.AvatarService.SetAvatar(destination, avatarData);
             }
             catch (Exception e)
             {
                m_log.WarnFormat("[RADMIN] Error transferring appearance for {0} : {1}",
-                                  dest, e.Message);
+                                  destination, e.Message);
             }
 
             return;
@@ -1483,32 +1483,33 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         /// In parallel the avatar wearables and attachments are updated.
         /// </summary>
 
-        private void copyWearablesAndAttachments(UUID dest, UUID srca, AvatarAppearance ava)
+        private void CopyWearablesAndAttachments(UUID destination, UUID source, AvatarAppearance avatarAppearance)
         {
-            IInventoryService iserv = m_app.SceneManager.CurrentOrFirstScene.InventoryService;
+            IInventoryService inventoryService = m_application.SceneManager.CurrentOrFirstScene.InventoryService;
 
             // Get Clothing folder of receiver
-            InventoryFolderBase dstf = iserv.GetFolderForType(dest, AssetType.Clothing);
+            InventoryFolderBase destinationFolder = inventoryService.GetFolderForType(destination, AssetType.Clothing);
 
-            if (dstf == null)
+            if (destinationFolder == null)
                 throw new Exception("Cannot locate folder(s)");
 
             // Missing destination folder? This should *never* be the case
-            if (dstf.Type != (short)AssetType.Clothing)
+            if (destinationFolder.Type != (short)AssetType.Clothing)
             {
-                dstf = new InventoryFolderBase();
-                dstf.ID       = UUID.Random();
-                dstf.Name     = "Clothing";
-                dstf.Owner    = dest;
-                dstf.Type     = (short)AssetType.Clothing;
-                dstf.ParentID = iserv.GetRootFolder(dest).ID;
-                dstf.Version  = 1;
-                iserv.AddFolder(dstf);     // store base record
-                m_log.ErrorFormat("[RADMIN] Created folder for destination {0}", srca);
+                destinationFolder = new InventoryFolderBase();
+                                
+                destinationFolder.ID       = UUID.Random();
+                destinationFolder.Name     = "Clothing";
+                destinationFolder.Owner    = destination;
+                destinationFolder.Type     = (short)AssetType.Clothing;
+                destinationFolder.ParentID = inventoryService.GetRootFolder(destination).ID;
+                destinationFolder.Version  = 1;
+                inventoryService.AddFolder(destinationFolder);     // store base record
+                m_log.ErrorFormat("[RADMIN] Created folder for destination {0}", source);
             }
 
             // Wearables
-            AvatarWearable[] wearables = ava.Wearables;
+            AvatarWearable[] wearables = avatarAppearance.Wearables;
             AvatarWearable wearable;
 
             for (int i=0; i<wearables.Length; i++)
@@ -1517,95 +1518,95 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (wearable.ItemID != UUID.Zero)
                 {
                     // Get inventory item and copy it
-                    InventoryItemBase item = new InventoryItemBase(wearable.ItemID, srca);
-                    item = iserv.GetItem(item);
+                    InventoryItemBase item = new InventoryItemBase(wearable.ItemID, source);
+                    item = inventoryService.GetItem(item);
 
                     if (item != null)
                     {
-                        InventoryItemBase dsti = new InventoryItemBase(UUID.Random(), dest);
-                        dsti.Name = item.Name;
-                        dsti.Description = item.Description;
-                        dsti.InvType = item.InvType;
-                        dsti.CreatorId = item.CreatorId;
-                        dsti.CreatorIdAsUuid = item.CreatorIdAsUuid;
-                        dsti.NextPermissions = item.NextPermissions;
-                        dsti.CurrentPermissions = item.CurrentPermissions;
-                        dsti.BasePermissions = item.BasePermissions;
-                        dsti.EveryOnePermissions = item.EveryOnePermissions;
-                        dsti.GroupPermissions = item.GroupPermissions;
-                        dsti.AssetType = item.AssetType;
-                        dsti.AssetID = item.AssetID;
-                        dsti.GroupID = item.GroupID;
-                        dsti.GroupOwned = item.GroupOwned;
-                        dsti.SalePrice = item.SalePrice;
-                        dsti.SaleType = item.SaleType;
-                        dsti.Flags = item.Flags;
-                        dsti.CreationDate = item.CreationDate;
-                        dsti.Folder = dstf.ID;
-
-                        iserv.AddItem(dsti);
-                        m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", dsti.ID, dstf.ID);
+                        InventoryItemBase destinationItem = new InventoryItemBase(UUID.Random(), destination);
+                        destinationItem.Name = item.Name;
+                        destinationItem.Description = item.Description;
+                        destinationItem.InvType = item.InvType;
+                        destinationItem.CreatorId = item.CreatorId;
+                        destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
+                        destinationItem.NextPermissions = item.NextPermissions;
+                        destinationItem.CurrentPermissions = item.CurrentPermissions;
+                        destinationItem.BasePermissions = item.BasePermissions;
+                        destinationItem.EveryOnePermissions = item.EveryOnePermissions;
+                        destinationItem.GroupPermissions = item.GroupPermissions;
+                        destinationItem.AssetType = item.AssetType;
+                        destinationItem.AssetID = item.AssetID;
+                        destinationItem.GroupID = item.GroupID;
+                        destinationItem.GroupOwned = item.GroupOwned;
+                        destinationItem.SalePrice = item.SalePrice;
+                        destinationItem.SaleType = item.SaleType;
+                        destinationItem.Flags = item.Flags;
+                        destinationItem.CreationDate = item.CreationDate;
+                        destinationItem.Folder = destinationFolder.ID;
+
+                        inventoryService.AddItem(destinationItem);
+                        m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", destinationItem.ID, destinationFolder.ID);
 
                         // Wear item
-                        AvatarWearable dw = new AvatarWearable();
-                        dw.AssetID = wearable.AssetID;
-                        dw.ItemID  = dsti.ID;
-                        ava.SetWearable(i, dw);
+                        AvatarWearable newWearable = new AvatarWearable();
+                        newWearable.AssetID = wearable.AssetID;
+                        newWearable.ItemID  = destinationItem.ID;
+                        avatarAppearance.SetWearable(i, newWearable);
                     }
                     else
                     {
-                        m_log.WarnFormat("[RADMIN] Error transferring {0} to folder {1}", wearable.ItemID, dstf.ID);
+                        m_log.WarnFormat("[RADMIN] Error transferring {0} to folder {1}", wearable.ItemID, destinationFolder.ID);
                     }
                 }
             }
 
             // Attachments
-            Dictionary<int, UUID[]> attachments = ava.GetAttachmentDictionary();
+            Dictionary<int, UUID[]> attachments = avatarAppearance.GetAttachmentDictionary();
 
-            foreach (KeyValuePair<int, UUID[]> kvp in attachments)
+            foreach (KeyValuePair<int, UUID[]> attachment in attachments)
             {
-                int attachpoint = kvp.Key;
-                UUID itemID = kvp.Value[0];
+                int attachpoint = attachment.Key;
+                UUID itemID = attachment.Value[0];
 
                 if (itemID != UUID.Zero)
                 {
                     // Get inventory item and copy it
-                    InventoryItemBase item = new InventoryItemBase(itemID, srca);
-                    item = iserv.GetItem(item);
+                    InventoryItemBase item = new InventoryItemBase(itemID, source);
+                    item = inventoryService.GetItem(item);
 
                     if (item != null)
                     {
-                        InventoryItemBase dsti = new InventoryItemBase(UUID.Random(), dest);
-                        dsti.Name = item.Name;
-                        dsti.Description = item.Description;
-                        dsti.InvType = item.InvType;
-                        dsti.CreatorId = item.CreatorId;
-                        dsti.CreatorIdAsUuid = item.CreatorIdAsUuid;
-                        dsti.NextPermissions = item.NextPermissions;
-                        dsti.CurrentPermissions = item.CurrentPermissions;
-                        dsti.BasePermissions = item.BasePermissions;
-                        dsti.EveryOnePermissions = item.EveryOnePermissions;
-                        dsti.GroupPermissions = item.GroupPermissions;
-                        dsti.AssetType = item.AssetType;
-                        dsti.AssetID = item.AssetID;
-                        dsti.GroupID = item.GroupID;
-                        dsti.GroupOwned = item.GroupOwned;
-                        dsti.SalePrice = item.SalePrice;
-                        dsti.SaleType = item.SaleType;
-                        dsti.Flags = item.Flags;
-                        dsti.CreationDate = item.CreationDate;
-                        dsti.Folder = dstf.ID;
-
-                        iserv.AddItem(dsti);
-                        m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", dsti.ID, dstf.ID);
+                        InventoryItemBase destinationItem = new InventoryItemBase(UUID.Random(), destination);
+                        destinationItem.Name = item.Name;
+                        destinationItem.Description = item.Description;
+                        destinationItem.InvType = item.InvType;
+                        destinationItem.CreatorId = item.CreatorId;
+                        destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
+                        destinationItem.NextPermissions = item.NextPermissions;
+                        destinationItem.CurrentPermissions = item.CurrentPermissions;
+                        destinationItem.BasePermissions = item.BasePermissions;
+                        destinationItem.EveryOnePermissions = item.EveryOnePermissions;
+                        destinationItem.GroupPermissions = item.GroupPermissions;
+                        destinationItem.AssetType = item.AssetType;
+                        destinationItem.AssetID = item.AssetID;
+                        destinationItem.GroupID = item.GroupID;
+                        destinationItem.GroupOwned = item.GroupOwned;
+                        destinationItem.SalePrice = item.SalePrice;
+                        destinationItem.SaleType = item.SaleType;
+                        destinationItem.Flags = item.Flags;
+                        destinationItem.CreationDate = item.CreationDate;
+                        destinationItem.Folder = destinationFolder.ID;
+
+                        inventoryService.AddItem(destinationItem);
+                        m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", destinationItem.ID, destinationFolder.ID);
 
                         // Attach item
-                        ava.SetAttachment(attachpoint, dsti.ID, dsti.AssetID);
-                        m_log.DebugFormat("[RADMIN] Attached {0}", dsti.ID);
+                        avatarAppearance.SetAttachment(attachpoint, destinationItem.ID, destinationItem.AssetID);
+                        m_log.DebugFormat("[RADMIN] Attached {0}", destinationItem.ID);
                     }
                     else
                     {
-                        m_log.WarnFormat("[RADMIN] Error transferring {0} to folder {1}", itemID, dstf.ID);
+                        m_log.WarnFormat("[RADMIN] Error transferring {0} to folder {1}", itemID, destinationFolder.ID);
                     }
                 }
             }
@@ -1618,101 +1619,101 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         /// copies of Clothing and Bodyparts inventory folders and attaches worn attachments
         /// </summary>
 
-        private void copyInventoryFolders(UUID dest, UUID srca, AssetType assettype, Dictionary<UUID,UUID> imap,
-                                          AvatarAppearance ava)
+        private void CopyInventoryFolders(UUID destination, UUID source, AssetType assetType, Dictionary<UUID,UUID> inventoryMap,
+                                          AvatarAppearance avatarAppearance)
         {
-            IInventoryService iserv = m_app.SceneManager.CurrentOrFirstScene.InventoryService;
+            IInventoryService inventoryService = m_application.SceneManager.CurrentOrFirstScene.InventoryService;
 
-            InventoryFolderBase srcf = iserv.GetFolderForType(srca, assettype);
-            InventoryFolderBase dstf = iserv.GetFolderForType(dest, assettype);
+            InventoryFolderBase sourceFolder = inventoryService.GetFolderForType(source, assetType);
+            InventoryFolderBase destinationFolder = inventoryService.GetFolderForType(destination, assetType);
 
-            if (srcf == null || dstf == null)
+            if (sourceFolder == null || destinationFolder == null)
                 throw new Exception("Cannot locate folder(s)");
 
             // Missing source folder? This should *never* be the case
-            if (srcf.Type != (short)assettype)
+            if (sourceFolder.Type != (short)assetType)
             {
-                srcf = new InventoryFolderBase();
-                srcf.ID       = UUID.Random();
-                if (assettype == AssetType.Clothing) {
-                    srcf.Name     = "Clothing";
+                sourceFolder = new InventoryFolderBase();
+                sourceFolder.ID       = UUID.Random();
+                if (assetType == AssetType.Clothing) {
+                    sourceFolder.Name     = "Clothing";
                 } else {
-                    srcf.Name     = "Body Parts";
+                    sourceFolder.Name     = "Body Parts";
                 }
-                srcf.Owner    = srca;
-                srcf.Type     = (short)assettype;
-                srcf.ParentID = iserv.GetRootFolder(srca).ID;
-                srcf.Version  = 1;
-                iserv.AddFolder(srcf);     // store base record
-                m_log.ErrorFormat("[RADMIN] Created folder for source {0}", srca);
+                sourceFolder.Owner    = source;
+                sourceFolder.Type     = (short)assetType;
+                sourceFolder.ParentID = inventoryService.GetRootFolder(source).ID;
+                sourceFolder.Version  = 1;
+                inventoryService.AddFolder(sourceFolder);     // store base record
+                m_log.ErrorFormat("[RADMIN] Created folder for source {0}", source);
             }
 
             // Missing destination folder? This should *never* be the case
-            if (dstf.Type != (short)assettype)
+            if (destinationFolder.Type != (short)assetType)
             {
-                dstf = new InventoryFolderBase();
-                dstf.ID       = UUID.Random();
-                dstf.Name     = assettype.ToString();
-                dstf.Owner    = dest;
-                dstf.Type     = (short)assettype;
-                dstf.ParentID = iserv.GetRootFolder(dest).ID;
-                dstf.Version  = 1;
-                iserv.AddFolder(dstf);     // store base record
-                m_log.ErrorFormat("[RADMIN] Created folder for destination {0}", srca);
+                destinationFolder = new InventoryFolderBase();
+                destinationFolder.ID       = UUID.Random();
+                destinationFolder.Name     = assetType.ToString();
+                destinationFolder.Owner    = destination;
+                destinationFolder.Type     = (short)assetType;
+                destinationFolder.ParentID = inventoryService.GetRootFolder(destination).ID;
+                destinationFolder.Version  = 1;
+                inventoryService.AddFolder(destinationFolder);     // store base record
+                m_log.ErrorFormat("[RADMIN] Created folder for destination {0}", source);
             }
 
-            InventoryFolderBase efolder;
-            List<InventoryFolderBase> folders = iserv.GetFolderContent(srca, srcf.ID).Folders;
+            InventoryFolderBase extraFolder;
+            List<InventoryFolderBase> folders = inventoryService.GetFolderContent(source, sourceFolder.ID).Folders;
 
             foreach (InventoryFolderBase folder in folders)
             {
 
-                efolder = new InventoryFolderBase();
-                efolder.ID = UUID.Random();
-                efolder.Name = folder.Name;
-                efolder.Owner = dest;
-                efolder.Type = folder.Type;
-                efolder.Version = folder.Version;
-                efolder.ParentID = dstf.ID;
-                iserv.AddFolder(efolder);
+                extraFolder = new InventoryFolderBase();
+                extraFolder.ID = UUID.Random();
+                extraFolder.Name = folder.Name;
+                extraFolder.Owner = destination;
+                extraFolder.Type = folder.Type;
+                extraFolder.Version = folder.Version;
+                extraFolder.ParentID = destinationFolder.ID;
+                inventoryService.AddFolder(extraFolder);
 
-                m_log.DebugFormat("[RADMIN] Added folder {0} to folder {1}", efolder.ID, srcf.ID);
+                m_log.DebugFormat("[RADMIN] Added folder {0} to folder {1}", extraFolder.ID, sourceFolder.ID);
 
-                List<InventoryItemBase> items = iserv.GetFolderContent(srca, folder.ID).Items;
+                List<InventoryItemBase> items = inventoryService.GetFolderContent(source, folder.ID).Items;
 
                 foreach (InventoryItemBase item in items)
                 {
-                    InventoryItemBase dsti = new InventoryItemBase(UUID.Random(), dest);
-                    dsti.Name = item.Name;
-                    dsti.Description = item.Description;
-                    dsti.InvType = item.InvType;
-                    dsti.CreatorId = item.CreatorId;
-                    dsti.CreatorIdAsUuid = item.CreatorIdAsUuid;
-                    dsti.NextPermissions = item.NextPermissions;
-                    dsti.CurrentPermissions = item.CurrentPermissions;
-                    dsti.BasePermissions = item.BasePermissions;
-                    dsti.EveryOnePermissions = item.EveryOnePermissions;
-                    dsti.GroupPermissions = item.GroupPermissions;
-                    dsti.AssetType = item.AssetType;
-                    dsti.AssetID = item.AssetID;
-                    dsti.GroupID = item.GroupID;
-                    dsti.GroupOwned = item.GroupOwned;
-                    dsti.SalePrice = item.SalePrice;
-                    dsti.SaleType = item.SaleType;
-                    dsti.Flags = item.Flags;
-                    dsti.CreationDate = item.CreationDate;
-                    dsti.Folder = efolder.ID;
-
-                    iserv.AddItem(dsti);
-                    imap.Add(item.ID, dsti.ID);
-                    m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", dsti.ID, efolder.ID);
+                    InventoryItemBase destinationItem = new InventoryItemBase(UUID.Random(), destination);
+                    destinationItem.Name = item.Name;
+                    destinationItem.Description = item.Description;
+                    destinationItem.InvType = item.InvType;
+                    destinationItem.CreatorId = item.CreatorId;
+                    destinationItem.CreatorIdAsUuid = item.CreatorIdAsUuid;
+                    destinationItem.NextPermissions = item.NextPermissions;
+                    destinationItem.CurrentPermissions = item.CurrentPermissions;
+                    destinationItem.BasePermissions = item.BasePermissions;
+                    destinationItem.EveryOnePermissions = item.EveryOnePermissions;
+                    destinationItem.GroupPermissions = item.GroupPermissions;
+                    destinationItem.AssetType = item.AssetType;
+                    destinationItem.AssetID = item.AssetID;
+                    destinationItem.GroupID = item.GroupID;
+                    destinationItem.GroupOwned = item.GroupOwned;
+                    destinationItem.SalePrice = item.SalePrice;
+                    destinationItem.SaleType = item.SaleType;
+                    destinationItem.Flags = item.Flags;
+                    destinationItem.CreationDate = item.CreationDate;
+                    destinationItem.Folder = extraFolder.ID;
+
+                    inventoryService.AddItem(destinationItem);
+                    inventoryMap.Add(item.ID, destinationItem.ID);
+                    m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", destinationItem.ID, extraFolder.ID);
 
                     // Attach item, if original is attached
-                    int attachpoint = ava.GetAttachpoint(item.ID);
+                    int attachpoint = avatarAppearance.GetAttachpoint(item.ID);
                     if (attachpoint != 0)
                     {
-                        ava.SetAttachment(attachpoint, dsti.ID, dsti.AssetID);
-                        m_log.DebugFormat("[RADMIN] Attached {0}", dsti.ID);
+                        avatarAppearance.SetAttachment(attachpoint, destinationItem.ID, destinationItem.AssetID);
+                        m_log.DebugFormat("[RADMIN] Attached {0}", destinationItem.ID);
                     }
                 }
             }
@@ -1728,63 +1729,63 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         /// other outfits are provided to allow "real" avatars a way to easily change their outfits.
         /// </summary>
 
-        private bool createDefaultAvatars()
+        private bool CreateDefaultAvatars()
         {
             // Only load once
 
-            if (daload)
+            if (m_defaultAvatarsLoaded)
             {
                 return false;
             }
 
             m_log.DebugFormat("[RADMIN] Creating default avatar entries");
 
-            daload = true;
+            m_defaultAvatarsLoaded = true;
 
             // Load processing starts here...
 
             try
             {
-                string dafn = null;
+                string defaultAppearanceFileName = null;
 
                 //m_config may be null if RemoteAdmin configuration secition is missing or disabled in OpenSim.ini
                 if (m_config != null)
                 {
-                    dafn = m_config.GetString("default_appearance", "default_appearance.xml");
+                    defaultAppearanceFileName = m_config.GetString("default_appearance", "default_appearance.xml");
                 }
 
-                if (File.Exists(dafn))
+                if (File.Exists(defaultAppearanceFileName))
                 {
                     XmlDocument doc = new XmlDocument();
                     string name     = "*unknown*";
                     string email    = "anon@anon";
-                    uint   regX     = 1000;
-                    uint   regY     = 1000;
-                    string passwd   = UUID.Random().ToString(); // No requirement to sign-in.
+                    uint   regionXLocation     = 1000;
+                    uint   regionYLocation     = 1000;
+                    string password   = UUID.Random().ToString(); // No requirement to sign-in.
                     UUID ID = UUID.Zero;
-                    AvatarAppearance mava;
+                    AvatarAppearance avatarAppearance;
                     XmlNodeList avatars;
                     XmlNodeList assets;
                     XmlNode perms = null;
                     bool include = false;
                     bool select  = false;
 
-                    Scene scene = m_app.SceneManager.CurrentOrFirstScene;
-                    IInventoryService iserv = scene.InventoryService;
-                    IAssetService     aserv = scene.AssetService;
+                    Scene scene = m_application.SceneManager.CurrentOrFirstScene;
+                    IInventoryService inventoryService = scene.InventoryService;
+                    IAssetService assetService = scene.AssetService;
 
-                    doc.LoadXml(File.ReadAllText(dafn));
+                    doc.LoadXml(File.ReadAllText(defaultAppearanceFileName));
 
                     // Load up any included assets. Duplicates will be ignored
                     assets = doc.GetElementsByTagName("RequiredAsset");
-                    foreach (XmlNode asset in assets)
+                    foreach (XmlNode assetNode in assets)
                     {
-                        AssetBase rass = new AssetBase(UUID.Random(), GetStringAttribute(asset, "name", ""), SByte.Parse(GetStringAttribute(asset, "type", "")), UUID.Zero.ToString());
-                        rass.Description = GetStringAttribute(asset,"desc","");
-                        rass.Local       = Boolean.Parse(GetStringAttribute(asset,"local",""));
-                        rass.Temporary   = Boolean.Parse(GetStringAttribute(asset,"temporary",""));
-                        rass.Data        = Convert.FromBase64String(asset.InnerText);
-                        aserv.Store(rass);
+                        AssetBase asset = new AssetBase(UUID.Random(), GetStringAttribute(assetNode, "name", ""), SByte.Parse(GetStringAttribute(assetNode, "type", "")), UUID.Zero.ToString());
+                        asset.Description = GetStringAttribute(assetNode,"desc","");
+                        asset.Local       = Boolean.Parse(GetStringAttribute(assetNode,"local",""));
+                        asset.Temporary   = Boolean.Parse(GetStringAttribute(assetNode,"temporary",""));
+                        asset.Data        = Convert.FromBase64String(assetNode.InnerText);
+                        assetService.Store(asset);
                     }
 
                     avatars = doc.GetElementsByTagName("Avatar");
@@ -1803,19 +1804,19 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                             // Only the name value is mandatory
                             name   = GetStringAttribute(avatar,"name",name);
                             email  = GetStringAttribute(avatar,"email",email);
-                            regX   = GetUnsignedAttribute(avatar,"regx",regX);
-                            regY   = GetUnsignedAttribute(avatar,"regy",regY);
-                            passwd = GetStringAttribute(avatar,"password",passwd);
+                            regionXLocation   = GetUnsignedAttribute(avatar,"regx",regionXLocation);
+                            regionYLocation   = GetUnsignedAttribute(avatar,"regy",regionYLocation);
+                            password = GetStringAttribute(avatar,"password",password);
 
-                            string[] nomens = name.Split();
+                            string[] names = name.Split();
                             UUID scopeID = scene.RegionInfo.ScopeID;
-                            UserAccount account = scene.UserAccountService.GetUserAccount(scopeID, nomens[0], nomens[1]);
+                            UserAccount account = scene.UserAccountService.GetUserAccount(scopeID, names[0], names[1]);
                             if (null == account)
                             {
-                                account = CreateUser(scopeID, nomens[0], nomens[1], passwd, email);
+                                account = CreateUser(scopeID, names[0], names[1], password, email);
                                 if (null == account)
                                 {
-                                    m_log.ErrorFormat("[RADMIN] Avatar {0} {1} was not created", nomens[0], nomens[1]);
+                                    m_log.ErrorFormat("[RADMIN] Avatar {0} {1} was not created", names[0], names[1]);
                                     return false;
                                 }
                             }
@@ -1823,12 +1824,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                             // Set home position
 
                             GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 
-                                (int)(regX * Constants.RegionSize), (int)(regY * Constants.RegionSize));
+                                (int)(regionXLocation * Constants.RegionSize), (int)(regionYLocation * Constants.RegionSize));
                             if (null == home) {
-                                m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", nomens[0], nomens[1]);
+                                m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", names[0], names[1]);
                             } else {
                                 scene.GridUserService.SetHome(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
-                                m_log.DebugFormat("[RADMIN]: Set home region {0} for updated user account {1} {2}", home.RegionID, nomens[0], nomens[1]);
+                                m_log.DebugFormat("[RADMIN]: Set home region {0} for updated user account {1} {2}", home.RegionID, names[0], names[1]);
                             }
 
                             ID = account.PrincipalID;
@@ -1850,13 +1851,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         if (include)
                         {
                             // Setup for appearance processing
-                            AvatarData adata = scene.AvatarService.GetAvatar(ID);
-                            if (adata != null)
-                                mava = adata.ToAvatarAppearance(ID);
+                            AvatarData avatarData = scene.AvatarService.GetAvatar(ID);
+                            if (avatarData != null)
+                                avatarAppearance = avatarData.ToAvatarAppearance(ID);
                             else
-                                mava = new AvatarAppearance();
+                                avatarAppearance = new AvatarAppearance();
 
-                            AvatarWearable[] wearables = mava.Wearables;
+                            AvatarWearable[] wearables = avatarAppearance.Wearables;
                             for (int i=0; i<wearables.Length; i++)
                             {
                                 wearables[i] = new AvatarWearable();
@@ -1867,19 +1868,19 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                 // m_log.DebugFormat("[RADMIN] {0} folders, {1} items in inventory",
                                 //   uic.folders.Count, uic.items.Count);
 
-                                InventoryFolderBase cfolder = iserv.GetFolderForType(ID, AssetType.Clothing);
+                                InventoryFolderBase clothingFolder = inventoryService.GetFolderForType(ID, AssetType.Clothing);
 
                                 // This should *never* be the case
-                                if (cfolder == null || cfolder.Type != (short)AssetType.Clothing)
+                                if (clothingFolder == null || clothingFolder.Type != (short)AssetType.Clothing)
                                 {
-                                    cfolder = new InventoryFolderBase();
-                                    cfolder.ID       = UUID.Random();
-                                    cfolder.Name     = "Clothing";
-                                    cfolder.Owner    = ID;
-                                    cfolder.Type     = (short)AssetType.Clothing;
-                                    cfolder.ParentID = iserv.GetRootFolder(ID).ID;
-                                    cfolder.Version  = 1;
-                                    iserv.AddFolder(cfolder);     // store base record
+                                    clothingFolder = new InventoryFolderBase();
+                                    clothingFolder.ID       = UUID.Random();
+                                    clothingFolder.Name     = "Clothing";
+                                    clothingFolder.Owner    = ID;
+                                    clothingFolder.Type     = (short)AssetType.Clothing;
+                                    clothingFolder.ParentID = inventoryService.GetRootFolder(ID).ID;
+                                    clothingFolder.Version  = 1;
+                                    inventoryService.AddFolder(clothingFolder);     // store base record
                                     m_log.ErrorFormat("[RADMIN] Created clothing folder for {0}/{1}", name, ID);
                                 }
 
@@ -1887,8 +1888,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                 // default appearance XMl file.
 
                                 XmlNodeList outfits = avatar.GetElementsByTagName("Ensemble");
-                                InventoryFolderBase efolder;
-                                string oname;
+                                InventoryFolderBase extraFolder;
+                                string outfitName;
                                 UUID assetid;
 
                                 foreach (XmlElement outfit in outfits)
@@ -1896,37 +1897,37 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                     m_log.DebugFormat("[RADMIN] Loading outfit {0} for {1}",
                                         GetStringAttribute(outfit,"name","?"), GetStringAttribute(avatar,"name","?"));
 
-                                    oname   = GetStringAttribute(outfit,"name","");
+                                    outfitName   = GetStringAttribute(outfit,"name","");
                                     select  = (GetStringAttribute(outfit,"default","no") == "yes");
 
                                     // If the folder already exists, re-use it. The defaults may
                                     // change over time. Augment only.
 
-                                    List<InventoryFolderBase> folders = iserv.GetFolderContent(ID, cfolder.ID).Folders;
-                                    efolder = null;
+                                    List<InventoryFolderBase> folders = inventoryService.GetFolderContent(ID, clothingFolder.ID).Folders;
+                                    extraFolder = null;
 
                                     foreach (InventoryFolderBase folder in folders)
                                     {
-                                    if (folder.Name == oname)
+                                    if (folder.Name == outfitName)
                                         {
-                                            efolder = folder;
+                                            extraFolder = folder;
                                             break;
                                         }
                                     }
 
                                     // Otherwise, we must create the folder.
-                                    if (efolder == null)
+                                    if (extraFolder == null)
                                     {
-                                        m_log.DebugFormat("[RADMIN] Creating outfit folder {0} for {1}", oname, name);
-                                        efolder          = new InventoryFolderBase();
-                                        efolder.ID       = UUID.Random();
-                                        efolder.Name     = oname;
-                                        efolder.Owner    = ID;
-                                        efolder.Type     = (short)AssetType.Clothing;
-                                        efolder.Version  = 1;
-                                        efolder.ParentID = cfolder.ID;
-                                        iserv.AddFolder(efolder);
-                                        m_log.DebugFormat("[RADMIN] Adding outfile folder {0} to folder {1}", efolder.ID, cfolder.ID);
+                                        m_log.DebugFormat("[RADMIN] Creating outfit folder {0} for {1}", outfitName, name);
+                                        extraFolder          = new InventoryFolderBase();
+                                        extraFolder.ID       = UUID.Random();
+                                        extraFolder.Name     = outfitName;
+                                        extraFolder.Owner    = ID;
+                                        extraFolder.Type     = (short)AssetType.Clothing;
+                                        extraFolder.Version  = 1;
+                                        extraFolder.ParentID = clothingFolder.ID;
+                                        inventoryService.AddFolder(extraFolder);
+                                        m_log.DebugFormat("[RADMIN] Adding outfile folder {0} to folder {1}", extraFolder.ID, clothingFolder.ID);
                                     }
 
                                     // Now get the pieces that make up the outfit
@@ -1950,55 +1951,55 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                             }
                                         }
 
-                                        InventoryItemBase iitem = null;
+                                        InventoryItemBase inventoryItem = null;
 
                                         // Check if asset is in inventory already
-                                        iitem = null;
-                                        List<InventoryItemBase> iitems = iserv.GetFolderContent(ID, efolder.ID).Items;
+                                        inventoryItem = null;
+                                        List<InventoryItemBase> inventoryItems = inventoryService.GetFolderContent(ID, extraFolder.ID).Items;
 
-                                        foreach (InventoryItemBase litem in iitems)
+                                        foreach (InventoryItemBase listItem in inventoryItems)
                                         {
-                                            if (litem.AssetID == assetid)
+                                            if (listItem.AssetID == assetid)
                                             {
-                                                iitem = litem;
+                                                inventoryItem = listItem;
                                                 break;
                                             }
                                         }
 
                                         // Create inventory item
-                                        if (iitem == null)
+                                        if (inventoryItem == null)
                                         {
-                                            iitem = new InventoryItemBase(UUID.Random(), ID);
-                                            iitem.Name = GetStringAttribute(item,"name","");
-                                            iitem.Description = GetStringAttribute(item,"desc","");
-                                            iitem.InvType = GetIntegerAttribute(item,"invtype",-1);
-                                            iitem.CreatorId = GetStringAttribute(item,"creatorid","");
-                                            iitem.CreatorIdAsUuid = (UUID)GetStringAttribute(item,"creatoruuid","");
-                                            iitem.NextPermissions = GetUnsignedAttribute(perms,"next",0x7fffffff);
-                                            iitem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff);
-                                            iitem.BasePermissions = GetUnsignedAttribute(perms,"base",0x7fffffff);
-                                            iitem.EveryOnePermissions = GetUnsignedAttribute(perms,"everyone",0x7fffffff);
-                                            iitem.GroupPermissions = GetUnsignedAttribute(perms,"group",0x7fffffff);
-                                            iitem.AssetType = GetIntegerAttribute(item,"assettype",-1);
-                                            iitem.AssetID = assetid; // associated asset
-                                            iitem.GroupID = (UUID)GetStringAttribute(item,"groupid","");
-                                            iitem.GroupOwned = (GetStringAttribute(item,"groupowned","false") == "true");
-                                            iitem.SalePrice = GetIntegerAttribute(item,"saleprice",0);
-                                            iitem.SaleType = (byte)GetIntegerAttribute(item,"saletype",0);
-                                            iitem.Flags = GetUnsignedAttribute(item,"flags",0);
-                                            iitem.CreationDate = GetIntegerAttribute(item,"creationdate",Util.UnixTimeSinceEpoch());
-                                            iitem.Folder = efolder.ID; // Parent folder
-
-                                            iserv.AddItem(iitem);
-                                            m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", iitem.ID, efolder.ID);
+                                            inventoryItem = new InventoryItemBase(UUID.Random(), ID);
+                                            inventoryItem.Name = GetStringAttribute(item,"name","");
+                                            inventoryItem.Description = GetStringAttribute(item,"desc","");
+                                            inventoryItem.InvType = GetIntegerAttribute(item,"invtype",-1);
+                                            inventoryItem.CreatorId = GetStringAttribute(item,"creatorid","");
+                                            inventoryItem.CreatorIdAsUuid = (UUID)GetStringAttribute(item,"creatoruuid","");
+                                            inventoryItem.NextPermissions = GetUnsignedAttribute(perms,"next",0x7fffffff);
+                                            inventoryItem.CurrentPermissions = GetUnsignedAttribute(perms,"current",0x7fffffff);
+                                            inventoryItem.BasePermissions = GetUnsignedAttribute(perms,"base",0x7fffffff);
+                                            inventoryItem.EveryOnePermissions = GetUnsignedAttribute(perms,"everyone",0x7fffffff);
+                                            inventoryItem.GroupPermissions = GetUnsignedAttribute(perms,"group",0x7fffffff);
+                                            inventoryItem.AssetType = GetIntegerAttribute(item,"assettype",-1);
+                                            inventoryItem.AssetID = assetid; // associated asset
+                                            inventoryItem.GroupID = (UUID)GetStringAttribute(item,"groupid","");
+                                            inventoryItem.GroupOwned = (GetStringAttribute(item,"groupowned","false") == "true");
+                                            inventoryItem.SalePrice = GetIntegerAttribute(item,"saleprice",0);
+                                            inventoryItem.SaleType = (byte)GetIntegerAttribute(item,"saletype",0);
+                                            inventoryItem.Flags = GetUnsignedAttribute(item,"flags",0);
+                                            inventoryItem.CreationDate = GetIntegerAttribute(item,"creationdate",Util.UnixTimeSinceEpoch());
+                                            inventoryItem.Folder = extraFolder.ID; // Parent folder
+
+                                            inventoryService.AddItem(inventoryItem);
+                                            m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", inventoryItem.ID, extraFolder.ID);
                                         }
 
                                         // Attach item, if attachpoint is specified
                                         int attachpoint = GetIntegerAttribute(item,"attachpoint",0);
                                         if (attachpoint != 0)
                                         {
-                                            mava.SetAttachment(attachpoint, iitem.ID, iitem.AssetID);
-                                            m_log.DebugFormat("[RADMIN] Attached {0}", iitem.ID);
+                                            avatarAppearance.SetAttachment(attachpoint, inventoryItem.ID, inventoryItem.AssetID);
+                                            m_log.DebugFormat("[RADMIN] Attached {0}", inventoryItem.ID);
                                         }
 
                                         // Record whether or not the item is to be initially worn
@@ -2006,20 +2007,20 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                         {
                                         if (select && (GetStringAttribute(item, "wear", "false") == "true"))
                                             {
-                                                mava.Wearables[iitem.Flags].ItemID = iitem.ID;
-                                                mava.Wearables[iitem.Flags].AssetID = iitem.AssetID;
+                                                avatarAppearance.Wearables[inventoryItem.Flags].ItemID = inventoryItem.ID;
+                                                avatarAppearance.Wearables[inventoryItem.Flags].AssetID = inventoryItem.AssetID;
                                             }
                                         }
                                         catch (Exception e)
                                         {
-                                            m_log.WarnFormat("[RADMIN] Error wearing item {0} : {1}", iitem.ID, e.Message);
+                                            m_log.WarnFormat("[RADMIN] Error wearing item {0} : {1}", inventoryItem.ID, e.Message);
                                         }
                                     } // foreach item in outfit
-                                    m_log.DebugFormat("[RADMIN] Outfit {0} load completed", oname);
+                                    m_log.DebugFormat("[RADMIN] Outfit {0} load completed", outfitName);
                                 } // foreach outfit
                                 m_log.DebugFormat("[RADMIN] Inventory update complete for {0}", name);
-                                AvatarData adata2 = new AvatarData(mava);
-                                scene.AvatarService.SetAvatar(ID, adata2);
+                                AvatarData avatarData2 = new AvatarData(avatarAppearance);
+                                scene.AvatarService.SetAvatar(ID, avatarData2);
                             }
                             catch (Exception e)
                             {
@@ -2086,19 +2087,19 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (rslock)
+            lock (m_requestLock)
             {
                 try
                 {
                     Hashtable requestData = (Hashtable) request.Params[0];
 
                     // check completeness
-                    foreach (string p in new string[] {"password", "filename"})
+                    foreach (string parameter in new string[] {"password", "filename"})
                     {
-                        if (!requestData.Contains(p))
-                            throw new Exception(String.Format("missing parameter {0}", p));
-                        if (String.IsNullOrEmpty((string) requestData[p]))
-                            throw new Exception(String.Format("parameter {0} is empty"));
+                        if (!requestData.Contains(parameter))
+                            throw new Exception(String.Format("missing parameter {0}", parameter));
+                        if (String.IsNullOrEmpty((string) requestData[parameter]))
+                            throw new Exception(String.Format("parameter {0} is empty", parameter));
                     }
 
                     // check password
@@ -2110,13 +2111,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     if (requestData.Contains("region_uuid"))
                     {
                         UUID region_uuid = (UUID) (string) requestData["region_uuid"];
-                        if (!m_app.SceneManager.TryGetScene(region_uuid, out scene))
+                        if (!m_application.SceneManager.TryGetScene(region_uuid, out scene))
                             throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
                     }
                     else if (requestData.Contains("region_name"))
                     {
                         string region_name = (string) requestData["region_name"];
-                        if (!m_app.SceneManager.TryGetScene(region_name, out scene))
+                        if (!m_application.SceneManager.TryGetScene(region_name, out scene))
                             throw new Exception(String.Format("failed to switch to region {0}", region_name));
                     }
                     else throw new Exception("neither region_name nor region_uuid given");
@@ -2210,13 +2211,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (requestData.Contains("region_uuid"))
                 {
                     UUID region_uuid = (UUID) (string) requestData["region_uuid"];
-                    if (!m_app.SceneManager.TryGetScene(region_uuid, out scene))
+                    if (!m_application.SceneManager.TryGetScene(region_uuid, out scene))
                         throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
                 }
                 else if (requestData.Contains("region_name"))
                 {
                     string region_name = (string) requestData["region_name"];
-                    if (!m_app.SceneManager.TryGetScene(region_name, out scene))
+                    if (!m_application.SceneManager.TryGetScene(region_name, out scene))
                         throw new Exception(String.Format("failed to switch to region {0}", region_name));
                 }
                 else throw new Exception("neither region_name nor region_uuid given");
@@ -2227,7 +2228,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 {
                     scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted;
                     archiver.ArchiveRegion(filename);
-                    lock (SOLock) Monitor.Wait(SOLock,5000);
+                    lock (m_saveOarLock) Monitor.Wait(m_saveOarLock,5000);
                     scene.EventManager.OnOarFileSaved -= RemoteAdminOarSaveCompleted;
                 }
                 else
@@ -2255,7 +2256,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         private void RemoteAdminOarSaveCompleted(Guid uuid, string name)
         {
             m_log.DebugFormat("[RADMIN] File processing complete for {0}", name);
-            lock (SOLock) Monitor.Pulse(SOLock);
+            lock (m_saveOarLock) Monitor.Pulse(m_saveOarLock);
         }
 
         public XmlRpcResponse XmlRpcLoadXMLMethod(XmlRpcRequest request, IPEndPoint remoteClient)
@@ -2267,7 +2268,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             XmlRpcResponse response = new XmlRpcResponse();
             Hashtable responseData = new Hashtable();
 
-            lock (rslock)
+            lock (m_requestLock)
             {
                 try
                 {
@@ -2290,14 +2291,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     if (requestData.Contains("region_uuid"))
                     {
                         UUID region_uuid = (UUID) (string) requestData["region_uuid"];
-                        if (!m_app.SceneManager.TrySetCurrentScene(region_uuid))
+                        if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
                             throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
                         m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString());
                     }
                     else if (requestData.Contains("region_name"))
                     {
                         string region_name = (string) requestData["region_name"];
-                        if (!m_app.SceneManager.TrySetCurrentScene(region_name))
+                        if (!m_application.SceneManager.TrySetCurrentScene(region_name))
                             throw new Exception(String.Format("failed to switch to region {0}", region_name));
                         m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name);
                     }
@@ -2314,11 +2315,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     switch (xml_version)
                     {
                         case "1":
-                            m_app.SceneManager.LoadCurrentSceneFromXml(filename, true, new Vector3(0, 0, 0));
+                            m_application.SceneManager.LoadCurrentSceneFromXml(filename, true, new Vector3(0, 0, 0));
                             break;
 
                         case "2":
-                            m_app.SceneManager.LoadCurrentSceneFromXml2(filename);
+                            m_application.SceneManager.LoadCurrentSceneFromXml2(filename);
                             break;
 
                         default:
@@ -2375,14 +2376,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (requestData.Contains("region_uuid"))
                 {
                     UUID region_uuid = (UUID) (string) requestData["region_uuid"];
-                    if (!m_app.SceneManager.TrySetCurrentScene(region_uuid))
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
                         throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString());
                 }
                 else if (requestData.Contains("region_name"))
                 {
                     string region_name = (string) requestData["region_name"];
-                    if (!m_app.SceneManager.TrySetCurrentScene(region_name))
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_name))
                         throw new Exception(String.Format("failed to switch to region {0}", region_name));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name);
                 }
@@ -2399,11 +2400,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 switch (xml_version)
                 {
                     case "1":
-                        m_app.SceneManager.SaveCurrentSceneToXml(filename);
+                        m_application.SceneManager.SaveCurrentSceneToXml(filename);
                         break;
 
                     case "2":
-                        m_app.SceneManager.SaveCurrentSceneToXml2(filename);
+                        m_application.SceneManager.SaveCurrentSceneToXml2(filename);
                         break;
 
                     default:
@@ -2454,21 +2455,21 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (requestData.Contains("region_uuid"))
                 {
                     UUID region_uuid = (UUID) (string) requestData["region_uuid"];
-                    if (!m_app.SceneManager.TrySetCurrentScene(region_uuid))
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
                         throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString());
                 }
                 else if (requestData.Contains("region_name"))
                 {
                     string region_name = (string) requestData["region_name"];
-                    if (!m_app.SceneManager.TrySetCurrentScene(region_name))
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_name))
                         throw new Exception(String.Format("failed to switch to region {0}", region_name));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name);
                 }
                 else throw new Exception("neither region_name nor region_uuid given");
 
-                Scene s = m_app.SceneManager.CurrentScene;
-                int health = s.GetHealth();
+                Scene scene = m_application.SceneManager.CurrentScene;
+                int health = scene.GetHealth();
                 responseData["health"] = health;
 
                 response.Value = responseData;
@@ -2551,23 +2552,23 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (requestData.Contains("region_uuid"))
                 {
                     UUID region_uuid = (UUID) (string) requestData["region_uuid"];
-                    if (!m_app.SceneManager.TrySetCurrentScene(region_uuid))
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
                         throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString());
                 }
                 else if (requestData.Contains("region_name"))
                 {
                     string region_name = (string) requestData["region_name"];
-                    if (!m_app.SceneManager.TrySetCurrentScene(region_name))
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_name))
                         throw new Exception(String.Format("failed to switch to region {0}", region_name));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name);
                 }
                 else throw new Exception("neither region_name nor region_uuid given");
 
-                Scene s = m_app.SceneManager.CurrentScene;
-                s.RegionInfo.EstateSettings.EstateAccess = new UUID[]{};
-                if (s.RegionInfo.Persistent)
-                    s.RegionInfo.EstateSettings.Save();
+                Scene scene = m_application.SceneManager.CurrentScene;
+                scene.RegionInfo.EstateSettings.EstateAccess = new UUID[]{};
+                if (scene.RegionInfo.Persistent)
+                    scene.RegionInfo.EstateSettings.Save();
             }
             catch (Exception e)
             {
@@ -2608,26 +2609,26 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (requestData.Contains("region_uuid"))
                 {
                     UUID region_uuid = (UUID) (string) requestData["region_uuid"];
-                    if (!m_app.SceneManager.TrySetCurrentScene(region_uuid))
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
                         throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString());
                 }
                 else if (requestData.Contains("region_name"))
                 {
                     string region_name = (string) requestData["region_name"];
-                    if (!m_app.SceneManager.TrySetCurrentScene(region_name))
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_name))
                         throw new Exception(String.Format("failed to switch to region {0}", region_name));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name);
                 }
                 else throw new Exception("neither region_name nor region_uuid given");
 
-                int addk = 0;
+                int addedUsers = 0;
 
                 if (requestData.Contains("users"))
                 {
-                    UUID scopeID = m_app.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
-                    IUserAccountService userService = m_app.SceneManager.CurrentOrFirstScene.UserAccountService;
-                    Scene s = m_app.SceneManager.CurrentScene;
+                    UUID scopeID = m_application.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
+                    IUserAccountService userService = m_application.SceneManager.CurrentOrFirstScene.UserAccountService;
+                    Scene scene = m_application.SceneManager.CurrentScene;
                     Hashtable users = (Hashtable) requestData["users"];
                     List<UUID> uuids = new List<UUID>();
                     foreach (string name in users.Values)
@@ -2637,24 +2638,24 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         if (account != null)
                         {
                             uuids.Add(account.PrincipalID);
-                            m_log.DebugFormat("[RADMIN] adding \"{0}\" to ACL for \"{1}\"", name, s.RegionInfo.RegionName);
+                            m_log.DebugFormat("[RADMIN] adding \"{0}\" to ACL for \"{1}\"", name, scene.RegionInfo.RegionName);
                         }
                     }
-                    List<UUID> acl = new List<UUID>(s.RegionInfo.EstateSettings.EstateAccess);
+                    List<UUID> accessControlList = new List<UUID>(scene.RegionInfo.EstateSettings.EstateAccess);
                     foreach (UUID uuid in uuids)
                     {
-                       if (!acl.Contains(uuid))
+                       if (!accessControlList.Contains(uuid))
                         {
-                            acl.Add(uuid);
-                            addk++;
+                            accessControlList.Add(uuid);
+                            addedUsers++;
                         }
                     }
-                    s.RegionInfo.EstateSettings.EstateAccess = acl.ToArray();
-                    if (s.RegionInfo.Persistent)
-                        s.RegionInfo.EstateSettings.Save();
+                    scene.RegionInfo.EstateSettings.EstateAccess = accessControlList.ToArray();
+                    if (scene.RegionInfo.Persistent)
+                        scene.RegionInfo.EstateSettings.Save();
                 }
 
-                responseData["added"] = addk;
+                responseData["added"] = addedUsers;
             }
             catch (Exception e)
             {
@@ -2695,27 +2696,27 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (requestData.Contains("region_uuid"))
                 {
                     UUID region_uuid = (UUID) (string) requestData["region_uuid"];
-                    if (!m_app.SceneManager.TrySetCurrentScene(region_uuid))
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
                         throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString());
                 }
                 else if (requestData.Contains("region_name"))
                 {
                     string region_name = (string) requestData["region_name"];
-                    if (!m_app.SceneManager.TrySetCurrentScene(region_name))
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_name))
                         throw new Exception(String.Format("failed to switch to region {0}", region_name));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name);
                 }
                 else throw new Exception("neither region_name nor region_uuid given");
 
-                int remk = 0;
+                int removedUsers = 0;
 
                 if (requestData.Contains("users"))
                 {
-                    UUID scopeID = m_app.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
-                    IUserAccountService userService = m_app.SceneManager.CurrentOrFirstScene.UserAccountService;
-                    //UserProfileCacheService ups = m_app.CommunicationsManager.UserProfileCacheService;
-                    Scene s = m_app.SceneManager.CurrentScene;
+                    UUID scopeID = m_application.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
+                    IUserAccountService userService = m_application.SceneManager.CurrentOrFirstScene.UserAccountService;
+                    //UserProfileCacheService ups = m_application.CommunicationsManager.UserProfileCacheService;
+                    Scene scene = m_application.SceneManager.CurrentScene;
                     Hashtable users = (Hashtable) requestData["users"];
                     List<UUID> uuids = new List<UUID>();
                     foreach (string name in users.Values)
@@ -2727,21 +2728,21 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                             uuids.Add(account.PrincipalID);
                         }
                     }
-                    List<UUID> acl = new List<UUID>(s.RegionInfo.EstateSettings.EstateAccess);
+                    List<UUID> accessControlList = new List<UUID>(scene.RegionInfo.EstateSettings.EstateAccess);
                     foreach (UUID uuid in uuids)
                     {
-                       if (acl.Contains(uuid))
+                       if (accessControlList.Contains(uuid))
                         {
-                            acl.Remove(uuid);
-                            remk++;
+                            accessControlList.Remove(uuid);
+                            removedUsers++;
                         }
                     }
-                    s.RegionInfo.EstateSettings.EstateAccess = acl.ToArray();
-                    if (s.RegionInfo.Persistent)
-                        s.RegionInfo.EstateSettings.Save();
+                    scene.RegionInfo.EstateSettings.EstateAccess = accessControlList.ToArray();
+                    if (scene.RegionInfo.Persistent)
+                        scene.RegionInfo.EstateSettings.Save();
                 }
 
-                responseData["removed"] = remk;
+                responseData["removed"] = removedUsers;
             }
             catch (Exception e)
             {
@@ -2782,27 +2783,27 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 if (requestData.Contains("region_uuid"))
                 {
                     UUID region_uuid = (UUID) (string) requestData["region_uuid"];
-                    if (!m_app.SceneManager.TrySetCurrentScene(region_uuid))
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_uuid))
                         throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString());
                 }
                 else if (requestData.Contains("region_name"))
                 {
                     string region_name = (string) requestData["region_name"];
-                    if (!m_app.SceneManager.TrySetCurrentScene(region_name))
+                    if (!m_application.SceneManager.TrySetCurrentScene(region_name))
                         throw new Exception(String.Format("failed to switch to region {0}", region_name));
                     m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name);
                 }
                 else throw new Exception("neither region_name nor region_uuid given");
 
-                Scene s = m_app.SceneManager.CurrentScene;
-                UUID[] acl = s.RegionInfo.EstateSettings.EstateAccess;
+                Scene scene = m_application.SceneManager.CurrentScene;
+                UUID[] accessControlList = scene.RegionInfo.EstateSettings.EstateAccess;
                 Hashtable users = new Hashtable();
 
-                foreach (UUID user in acl)
+                foreach (UUID user in accessControlList)
                 {
-                    UUID scopeID = m_app.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
-                    UserAccount account = m_app.SceneManager.CurrentOrFirstScene.UserAccountService.GetUserAccount(scopeID, user);
+                    UUID scopeID = m_application.SceneManager.CurrentOrFirstScene.RegionInfo.ScopeID;
+                    UserAccount account = m_application.SceneManager.CurrentOrFirstScene.UserAccountService.GetUserAccount(scopeID, user);
                     if (account != null)
                     {
                         users[user.ToString()] = account.FirstName + " " + account.LastName;
@@ -2827,29 +2828,29 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             return response;
         }
 
-        private static void checkStringParameters(XmlRpcRequest request, string[] param)
+        private static void CheckStringParameters(XmlRpcRequest request, string[] param)
         {
             Hashtable requestData = (Hashtable) request.Params[0];
-            foreach (string p in param)
+            foreach (string parameter in param)
             {
-                if (!requestData.Contains(p))
-                    throw new Exception(String.Format("missing string parameter {0}", p));
-                if (String.IsNullOrEmpty((string) requestData[p]))
-                    throw new Exception(String.Format("parameter {0} is empty", p));
+                if (!requestData.Contains(parameter))
+                    throw new Exception(String.Format("missing string parameter {0}", parameter));
+                if (String.IsNullOrEmpty((string) requestData[parameter]))
+                    throw new Exception(String.Format("parameter {0} is empty", parameter));
             }
         }
 
-        private static void checkIntegerParams(XmlRpcRequest request, string[] param)
+        private static void CheckIntegerParams(XmlRpcRequest request, string[] param)
         {
             Hashtable requestData = (Hashtable) request.Params[0];
-            foreach (string p in param)
+            foreach (string parameter in param)
             {
-                if (!requestData.Contains(p))
-                    throw new Exception(String.Format("missing integer parameter {0}", p));
+                if (!requestData.Contains(parameter))
+                    throw new Exception(String.Format("missing integer parameter {0}", parameter));
             }
         }
 
-        private bool getBoolean(Hashtable requestData, string tag, bool defv)
+        private bool GetBoolean(Hashtable requestData, string tag, bool defaultValue)
         {
             // If an access value has been provided, apply it.
             if (requestData.Contains(tag))
@@ -2865,29 +2866,29 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     case "0" :
                         return false;
                     default :
-                        return defv;
+                        return defaultValue;
                 }
             }
             else
-                return defv;
+                return defaultValue;
         }
 
-        private int GetIntegerAttribute(XmlNode node, string attr, int dv)
+        private int GetIntegerAttribute(XmlNode node, string attribute, int defaultValue)
         {
-            try { return Convert.ToInt32(node.Attributes[attr].Value); } catch{}
-            return dv;
+            try { return Convert.ToInt32(node.Attributes[attribute].Value); } catch{}
+            return defaultValue;
         }
 
-        private uint GetUnsignedAttribute(XmlNode node, string attr, uint dv)
+        private uint GetUnsignedAttribute(XmlNode node, string attribute, uint defaultValue)
         {
-            try { return Convert.ToUInt32(node.Attributes[attr].Value); } catch{}
-            return dv;
+            try { return Convert.ToUInt32(node.Attributes[attribute].Value); } catch{}
+            return defaultValue;
         }
 
-        private string GetStringAttribute(XmlNode node, string attr, string dv)
+        private string GetStringAttribute(XmlNode node, string attribute, string defaultValue)
         {
-            try { return node.Attributes[attr].Value; } catch{}
-            return dv;
+            try { return node.Attributes[attribute].Value; } catch{}
+            return defaultValue;
         }
 
         public void Dispose()
@@ -2904,14 +2905,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         /// <param name="email"></param>
         private UserAccount CreateUser(UUID scopeID, string firstName, string lastName, string password, string email)
         {
-            Scene scene = m_app.SceneManager.CurrentOrFirstScene;
-            IUserAccountService m_UserAccountService = scene.UserAccountService;
-            IGridService m_GridService = scene.GridService;
-            IAuthenticationService m_AuthenticationService = scene.AuthenticationService;
-            IGridUserService m_GridUserService = scene.GridUserService;
-            IInventoryService m_InventoryService = scene.InventoryService;
-
-            UserAccount account = m_UserAccountService.GetUserAccount(scopeID, firstName, lastName);
+            Scene scene = m_application.SceneManager.CurrentOrFirstScene;
+            IUserAccountService userAccountService = scene.UserAccountService;
+            IGridService gridService = scene.GridService;
+            IAuthenticationService authenticationService = scene.AuthenticationService;
+            IGridUserService gridUserService = scene.GridUserService;
+            IInventoryService inventoryService = scene.InventoryService;
+
+            UserAccount account = userAccountService.GetUserAccount(scopeID, firstName, lastName);
             if (null == account)
             {
                 account = new UserAccount(scopeID, firstName, lastName, email);
@@ -2924,26 +2925,26 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     account.ServiceURLs["AssetServerURI"] = string.Empty;
                 }
 
-                if (m_UserAccountService.StoreUserAccount(account))
+                if (userAccountService.StoreUserAccount(account))
                 {
                     bool success;
-                    if (m_AuthenticationService != null)
+                    if (authenticationService != null)
                     {
-                        success = m_AuthenticationService.SetPassword(account.PrincipalID, password);
+                        success = authenticationService.SetPassword(account.PrincipalID, password);
                         if (!success)
                             m_log.WarnFormat("[RADMIN]: Unable to set password for account {0} {1}.",
                                 firstName, lastName);
                     }
 
                     GridRegion home = null;
-                    if (m_GridService != null)
+                    if (gridService != null)
                     {
-                        List<GridRegion> defaultRegions = m_GridService.GetDefaultRegions(UUID.Zero);
+                        List<GridRegion> defaultRegions = gridService.GetDefaultRegions(UUID.Zero);
                         if (defaultRegions != null && defaultRegions.Count >= 1)
                             home = defaultRegions[0];
 
-                        if (m_GridUserService != null && home != null)
-                            m_GridUserService.SetHome(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
+                        if (gridUserService != null && home != null)
+                            gridUserService.SetHome(account.PrincipalID.ToString(), home.RegionID, new Vector3(128, 128, 0), new Vector3(0, 1, 0));
                         else
                             m_log.WarnFormat("[RADMIN]: Unable to set home for account {0} {1}.",
                                firstName, lastName);
@@ -2952,9 +2953,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         m_log.WarnFormat("[RADMIN]: Unable to retrieve home region for account {0} {1}.",
                            firstName, lastName);
 
-                    if (m_InventoryService != null)
+                    if (inventoryService != null)
                     {
-                        success = m_InventoryService.CreateUserInventory(account.PrincipalID);
+                        success = inventoryService.CreateUserInventory(account.PrincipalID);
                         if (!success)
                             m_log.WarnFormat("[RADMIN]: Unable to create inventory for account {0} {1}.",
                                 firstName, lastName);
@@ -2981,16 +2982,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         /// <param name="password"></param>
         private bool ChangeUserPassword(string firstName, string lastName, string password)
         {
-            Scene scene = m_app.SceneManager.CurrentOrFirstScene;
-            IUserAccountService m_UserAccountService = scene.UserAccountService;
-            IAuthenticationService m_AuthenticationService = scene.AuthenticationService;
+            Scene scene = m_application.SceneManager.CurrentOrFirstScene;
+            IUserAccountService userAccountService = scene.UserAccountService;
+            IAuthenticationService authenticationService = scene.AuthenticationService;
 
-            UserAccount account = m_UserAccountService.GetUserAccount(UUID.Zero, firstName, lastName);
+            UserAccount account = userAccountService.GetUserAccount(UUID.Zero, firstName, lastName);
             if (null != account)
             {
                 bool success = false;
-                if (m_AuthenticationService != null)
-                    success = m_AuthenticationService.SetPassword(account.PrincipalID, password);
+                if (authenticationService != null)
+                    success = authenticationService.SetPassword(account.PrincipalID, password);
                 if (!success) {
                     m_log.WarnFormat("[RADMIN]: Unable to set password for account {0} {1}.",
                        firstName, lastName);
diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index 8259f9b..42533c6 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -62,6 +62,7 @@ namespace OpenSim.Data
 
         List<RegionData> GetDefaultRegions(UUID scopeID);
         List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y);
+        List<RegionData> GetHyperlinks(UUID scopeID);
     }
 
     [Flags]
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index 66c3f81..9656be1 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -310,23 +310,23 @@ namespace OpenSim.Data.MSSQL
 
         public List<RegionData> GetDefaultRegions(UUID scopeID)
         {
-            string sql = "SELECT * FROM [" + m_Realm + "] WHERE (flags & 1) <> 0";
-            if (scopeID != UUID.Zero)
-                sql += " AND ScopeID = @scopeID";
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
-                conn.Open();
-                return RunCommand(cmd);
-            }
-            
+            return Get((int)RegionFlags.DefaultRegion, scopeID);
         }
 
         public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
         {
-            string sql = "SELECT * FROM [" + m_Realm + "] WHERE (flags & 2) <> 0";
+            // TODO: distance-sort results
+            return Get((int)RegionFlags.FallbackRegion, scopeID);
+        }
+
+        public List<RegionData> GetHyperlinks(UUID scopeID)
+        {
+            return Get((int)RegionFlags.Hyperlink, scopeID);
+        }
+
+        private List<RegionData> Get(int regionFlags, UUID scopeID)
+        {
+            string sql = "SELECT * FROM [" + m_Realm + "] WHERE (flags & " + regionFlags.ToString() + ") <> 0";
             if (scopeID != UUID.Zero)
                 sql += " AND ScopeID = @scopeID";
 
@@ -335,7 +335,6 @@ namespace OpenSim.Data.MSSQL
             {
                 cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
                 conn.Open();
-                // TODO: distance-sort results
                 return RunCommand(cmd);
             }
         }
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index c7bddac..aec37e2 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -281,22 +281,26 @@ namespace OpenSim.Data.MySQL
 
             return false;
         }
+
         public List<RegionData> GetDefaultRegions(UUID scopeID)
         {
-            string command = "select * from `"+m_Realm+"` where (flags & 1) <> 0";
-            if (scopeID != UUID.Zero)
-                command += " and ScopeID = ?scopeID";
-
-            MySqlCommand cmd = new MySqlCommand(command);
+            return Get((int)RegionFlags.DefaultRegion, scopeID);
+        }
 
-            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+        public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
+        {
+            // TODO: distance-sort results
+            return Get((int)RegionFlags.FallbackRegion, scopeID);
+        }
 
-            return RunCommand(cmd);
+        public List<RegionData> GetHyperlinks(UUID scopeID)
+        {
+            return Get((int)RegionFlags.Hyperlink, scopeID);
         }
 
-        public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
+        private List<RegionData> Get(int regionFlags, UUID scopeID)
         {
-            string command = "select * from `"+m_Realm+"` where (flags & 2) <> 0";
+            string command = "select * from `" + m_Realm + "` where (flags & " + regionFlags.ToString() + ") <> 0";
             if (scopeID != UUID.Zero)
                 command += " and ScopeID = ?scopeID";
 
@@ -304,7 +308,6 @@ namespace OpenSim.Data.MySQL
 
             cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
 
-            // TODO: distance-sort results
             return RunCommand(cmd);
         }
     }
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index d596698..f276d10 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -164,30 +164,29 @@ namespace OpenSim.Data.Null
 
         public List<RegionData> GetDefaultRegions(UUID scopeID)
         {
-            if (Instance != this)
-                return Instance.GetDefaultRegions(scopeID);
-
-            List<RegionData> ret = new List<RegionData>();
+            return Get((int)RegionFlags.DefaultRegion, scopeID);
+        }
 
-            foreach (RegionData r in m_regionData.Values)
-            {
-                if ((Convert.ToInt32(r.Data["flags"]) & 1) != 0)
-                    ret.Add(r);
-            }
+        public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
+        {
+            return Get((int)RegionFlags.FallbackRegion, scopeID);
+        }
 
-            return ret;
+        public List<RegionData> GetHyperlinks(UUID scopeID)
+        {
+            return Get((int)RegionFlags.Hyperlink, scopeID);
         }
 
-        public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
+        private List<RegionData> Get(int regionFlags, UUID scopeID)
         {
             if (Instance != this)
-                return Instance.GetFallbackRegions(scopeID, x, y);
+                return Instance.Get(regionFlags, scopeID);
 
             List<RegionData> ret = new List<RegionData>();
 
             foreach (RegionData r in m_regionData.Values)
             {
-                if ((Convert.ToInt32(r.Data["flags"]) & 2) != 0)
+                if ((Convert.ToInt32(r.Data["flags"]) & regionFlags) != 0)
                     ret.Add(r);
             }
 
diff --git a/OpenSim/Framework/ACL.cs b/OpenSim/Framework/ACL.cs
deleted file mode 100644
index f76e8b7..0000000
--- a/OpenSim/Framework/ACL.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-
-namespace OpenSim.Framework
-{
-    // ACL Class
-    // Modelled after the structure of the Zend ACL Framework Library
-    // with one key difference - the tree will search for all matching
-    // permissions rather than just the first. Deny permissions will
-    // override all others.
-
-    #region ACL Core Class
-
-    /// <summary>
-    /// Access Control List Engine
-    /// </summary>
-    public class ACL
-    {
-        private Dictionary<string, Resource> Resources = new Dictionary<string, Resource>();
-        private Dictionary<string, Role> Roles = new Dictionary<string, Role>();
-
-        /// <summary>
-        /// Adds a new role
-        /// </summary>
-        /// <param name="role"></param>
-        /// <returns></returns>
-        public ACL AddRole(Role role)
-        {
-            if (Roles.ContainsKey(role.Name))
-                throw new AlreadyContainsRoleException(role);
-
-            Roles.Add(role.Name, role);
-
-            return this;
-        }
-
-        /// <summary>
-        /// Adds a new resource
-        /// </summary>
-        /// <param name="resource"></param>
-        /// <returns></returns>
-        public ACL AddResource(Resource resource)
-        {
-            Resources.Add(resource.Name, resource);
-
-            return this;
-        }
-
-        /// <summary>
-        /// Permision for user/roll on a resource
-        /// </summary>
-        /// <param name="role"></param>
-        /// <param name="resource"></param>
-        /// <returns></returns>
-        public Permission HasPermission(string role, string resource)
-        {
-            if (!Roles.ContainsKey(role))
-                throw new KeyNotFoundException();
-
-            if (!Resources.ContainsKey(resource))
-                throw new KeyNotFoundException();
-
-            return Roles[role].RequestPermission(resource);
-        }
-
-        public ACL GrantPermission(string role, string resource)
-        {
-            if (!Roles.ContainsKey(role))
-                throw new KeyNotFoundException();
-
-            if (!Resources.ContainsKey(resource))
-                throw new KeyNotFoundException();
-
-            Roles[role].GivePermission(resource, Permission.Allow);
-
-            return this;
-        }
-
-        public ACL DenyPermission(string role, string resource)
-        {
-            if (!Roles.ContainsKey(role))
-                throw new KeyNotFoundException();
-
-            if (!Resources.ContainsKey(resource))
-                throw new KeyNotFoundException();
-
-            Roles[role].GivePermission(resource, Permission.Deny);
-
-            return this;
-        }
-
-        public ACL ResetPermission(string role, string resource)
-        {
-            if (!Roles.ContainsKey(role))
-                throw new KeyNotFoundException();
-
-            if (!Resources.ContainsKey(resource))
-                throw new KeyNotFoundException();
-
-            Roles[role].GivePermission(resource, Permission.None);
-
-            return this;
-        }
-    }
-
-    #endregion
-
-    #region Exceptions
-
-    /// <summary>
-    /// Thrown when an ACL attempts to add a duplicate role.
-    /// </summary>
-    public class AlreadyContainsRoleException : Exception
-    {
-        protected Role m_role;
-
-        public AlreadyContainsRoleException(Role role)
-        {
-            m_role = role;
-        }
-
-        public Role ErrorRole
-        {
-            get { return m_role; }
-        }
-
-        public override string ToString()
-        {
-            return "This ACL already contains a role called '" + m_role.Name + "'.";
-        }
-    }
-
-    #endregion
-
-    #region Roles and Resources
-
-    /// <summary>
-    /// Does this Role have permission to access a specified Resource?
-    /// </summary>
-    public enum Permission
-    {
-        Deny,
-        None,
-        Allow
-    } ;
-
-    /// <summary>
-    /// A role class, for use with Users or Groups
-    /// </summary>
-    public class Role
-    {
-        private string m_name;
-        private Role[] m_parents;
-        private Dictionary<string, Permission> m_resources = new Dictionary<string, Permission>();
-
-        public Role(string name)
-        {
-            m_name = name;
-            m_parents = null;
-        }
-
-        public Role(string name, Role[] parents)
-        {
-            m_name = name;
-            m_parents = parents;
-        }
-
-        public string Name
-        {
-            get { return m_name; }
-        }
-
-        public Permission RequestPermission(string resource)
-        {
-            return RequestPermission(resource, Permission.None);
-        }
-
-        public Permission RequestPermission(string resource, Permission current)
-        {
-            // Deny permissions always override any others
-            if (current == Permission.Deny)
-                return current;
-
-            Permission temp = Permission.None;
-
-            // Pickup non-None permissions
-            if (m_resources.ContainsKey(resource) && m_resources[resource] != Permission.None)
-                temp = m_resources[resource];
-
-            if (m_parents != null)
-            {
-                foreach (Role parent in m_parents)
-                {
-                    temp = parent.RequestPermission(resource, temp);
-                }
-            }
-
-            return temp;
-        }
-
-        public void GivePermission(string resource, Permission perm)
-        {
-            m_resources[resource] = perm;
-        }
-    }
-
-    public class Resource
-    {
-        private string m_name;
-
-        public Resource(string name)
-        {
-            m_name = name;
-        }
-
-        public string Name
-        {
-            get { return m_name; }
-        }
-    }
-
-    #endregion
-
-   
-}
\ No newline at end of file
diff --git a/OpenSim/Framework/ConfigBase.cs b/OpenSim/Framework/ConfigBase.cs
deleted file mode 100644
index 40ec32f..0000000
--- a/OpenSim/Framework/ConfigBase.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Framework
-{
-    public abstract class ConfigBase
-    {
-        protected ConfigurationMember m_configMember;
-    }
-}
diff --git a/OpenSim/Framework/FriendRegionInfo.cs b/OpenSim/Framework/FriendRegionInfo.cs
deleted file mode 100644
index 68b5f3d..0000000
--- a/OpenSim/Framework/FriendRegionInfo.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenMetaverse;
-
-namespace OpenSim.Framework
-{
-    public class FriendRegionInfo
-    {
-        public bool isOnline;
-        public ulong regionHandle;
-        public UUID regionID;
-    }
-}
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
deleted file mode 100644
index 3a43a14..0000000
--- a/OpenSim/Framework/GridConfig.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-
-namespace OpenSim.Framework
-{
-    public class GridConfig:ConfigBase
-    {
-        public string AllowForcefulBanlines = "TRUE";
-        public bool AllowRegionRegistration = true;
-        public string AssetRecvKey = String.Empty;
-        public string AssetSendKey = String.Empty;
-
-        public string DatabaseProvider = String.Empty;
-        public string DatabaseConnect = String.Empty;
-        public string DefaultAssetServer = String.Empty;
-        public string DefaultUserServer = String.Empty;
-        public uint HttpPort = ConfigSettings.DefaultGridServerHttpPort;
-        public string SimRecvKey = String.Empty;
-        public string SimSendKey = String.Empty;
-        public string UserRecvKey = String.Empty;
-        public string UserSendKey = String.Empty;
-        public string ConsoleUser = String.Empty;
-        public string ConsolePass = String.Empty;
-
-        public GridConfig(string description, string filename)
-        {
-            m_configMember =
-                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
-            m_configMember.performConfigurationRetrieve();
-        }
-
-        public void loadConfigurationOptions()
-        {
-            m_configMember.addConfigurationOption("default_asset_server",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "Default Asset Server URI",
-                                                "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/",
-                                                false);
-            m_configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to send to asset server", "null", false);
-            m_configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to expect from asset server", "null", false);
-
-            m_configMember.addConfigurationOption("default_user_server",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "Default User Server URI",
-                                                "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString() + "/", false);
-            m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to send to user server", "null", false);
-            m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to expect from user server", "null", false);
-
-            m_configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to send to a simulator", "null", false);
-            m_configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to expect from a simulator", "null", false);
-            m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
-            m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Database connect string", "", false);
-
-            m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Http Listener port", ConfigSettings.DefaultGridServerHttpPort.ToString(), false);
-
-            m_configMember.addConfigurationOption("allow_forceful_banlines",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Allow Forceful Banlines", "TRUE", true);
-            
-            m_configMember.addConfigurationOption("allow_region_registration", 
-                                                ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
-                                                "Allow regions to register immediately upon grid server startup? true/false", 
-                                                "True", 
-                                                false);
-            m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                 "Remote console access user name [Default: disabled]", "", false);
-
-            m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                 "Remote console access password [Default: disabled]", "", false);
-
-        }
-
-        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
-        {
-            switch (configuration_key)
-            {
-                case "default_asset_server":
-                    DefaultAssetServer = (string) configuration_result;
-                    break;
-                case "asset_send_key":
-                    AssetSendKey = (string) configuration_result;
-                    break;
-                case "asset_recv_key":
-                    AssetRecvKey = (string) configuration_result;
-                    break;
-                case "default_user_server":
-                    DefaultUserServer = (string) configuration_result;
-                    break;
-                case "user_send_key":
-                    UserSendKey = (string) configuration_result;
-                    break;
-                case "user_recv_key":
-                    UserRecvKey = (string) configuration_result;
-                    break;
-                case "sim_send_key":
-                    SimSendKey = (string) configuration_result;
-                    break;
-                case "sim_recv_key":
-                    SimRecvKey = (string) configuration_result;
-                    break;
-                case "database_provider":
-                    DatabaseProvider = (string) configuration_result;
-                    break;
-                case "database_connect":
-                    DatabaseConnect = (string) configuration_result;
-                    break;
-                case "http_port":
-                    HttpPort = (uint) configuration_result;
-                    break;
-                case "allow_forceful_banlines":
-                    AllowForcefulBanlines = (string) configuration_result;
-                    break;
-                case "allow_region_registration":
-                    AllowRegionRegistration = (bool)configuration_result;
-                    break;
-                case "console_user":
-                    ConsoleUser = (string)configuration_result;
-                    break;
-                case "console_pass":
-                    ConsolePass = (string)configuration_result;
-                    break;
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/OpenSim/Framework/HGNetworkServersInfo.cs b/OpenSim/Framework/HGNetworkServersInfo.cs
deleted file mode 100644
index 0865576..0000000
--- a/OpenSim/Framework/HGNetworkServersInfo.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System.Net;
-
-namespace OpenSim.Framework
-{
-    public class HGNetworkServersInfo
-    {
-
-        public readonly string LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI;
-
-        private static HGNetworkServersInfo m_singleton;
-        public static HGNetworkServersInfo Singleton
-        {
-            get { return m_singleton; }
-        }
-
-        public static void Init(string assetserver, string inventoryserver, string userserver)
-        {
-            m_singleton = new HGNetworkServersInfo(assetserver, inventoryserver, userserver);
-
-        }
-
-        private HGNetworkServersInfo(string a, string i, string u)
-        {
-            LocalAssetServerURI = ServerURI(a);
-            LocalInventoryServerURI = ServerURI(i);
-            LocalUserServerURI = ServerURI(u);
-        }
-
-        public bool IsLocalUser(string userserver)
-        {
-            string userServerURI = ServerURI(userserver);
-            bool ret = (((userServerURI == null) || (userServerURI == "") || (userServerURI == LocalUserServerURI)));
-            //m_log.Debug("-------------> HGNetworkServersInfo.IsLocalUser? " + ret + "(userServer=" + userServerURI + "; localuserserver=" + LocalUserServerURI + ")");
-            return ret;
-        }
-
-        public bool IsLocalUser(UserProfileData userData)
-        {
-            if (userData != null)
-            {
-                if (userData is ForeignUserProfileData)
-                    return IsLocalUser(((ForeignUserProfileData)userData).UserServerURI);
-                else
-                    return true;
-            }
-            else
-                // Something fishy; ignore it
-                return true;
-        }
-
-        public static string ServerURI(string uri)
-        {
-            // Get rid of eventual slashes at the end
-            try
-            {
-                if (uri.EndsWith("/"))
-                    uri = uri.Substring(0, uri.Length - 1);
-            }
-            catch { }
-
-            IPAddress ipaddr1 = null;
-            string port1 = "";
-            try
-            {
-                ipaddr1 = Util.GetHostFromURL(uri);
-            }
-            catch { }
-
-            try
-            {
-                port1 = uri.Split(new char[] { ':' })[2];
-            }
-            catch { }
-
-            // We tried our best to convert the domain names to IP addresses
-            return (ipaddr1 != null) ? "http://" + ipaddr1.ToString() + ":" + port1 : uri;
-        }
-
-    }
-}
diff --git a/OpenSim/Framework/IClientFileTransfer.cs b/OpenSim/Framework/IClientFileTransfer.cs
deleted file mode 100644
index f947b17..0000000
--- a/OpenSim/Framework/IClientFileTransfer.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using OpenMetaverse;
-
-namespace OpenSim.Framework
-{
-    public delegate void UploadComplete(string filename, UUID fileID, ulong transferID, byte[] fileData, IClientAPI remoteClient);
-    public delegate void UploadAborted(string filename, UUID fileID,  ulong transferID, IClientAPI remoteClient);
-
-    public interface IClientFileTransfer
-    {
-        bool RequestUpload(string clientFileName, UploadComplete uploadCompleteCallback, UploadAborted abortCallback);
-        bool RequestUpload(UUID fileID, UploadComplete uploadCompleteCallback, UploadAborted abortCallback);
-    }
-}
diff --git a/OpenSim/Framework/ILoginServiceToRegionsConnector.cs b/OpenSim/Framework/ILoginServiceToRegionsConnector.cs
deleted file mode 100644
index 5a155c1..0000000
--- a/OpenSim/Framework/ILoginServiceToRegionsConnector.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using OpenMetaverse;
-
-namespace OpenSim.Framework
-{
-    public interface ILoginServiceToRegionsConnector
-    {
-        void LogOffUserFromGrid(ulong regionHandle, UUID AvatarID, UUID RegionSecret, string message);
-        bool NewUserConnection(ulong regionHandle, AgentCircuitData agent, out string reason);
-        RegionInfo RequestClosestRegion(string region);
-        RegionInfo RequestNeighbourInfo(UUID regionID);
-        RegionInfo RequestNeighbourInfo(ulong regionhandle);
-    }
-}
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
deleted file mode 100644
index 884c0ea..0000000
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-
-namespace OpenSim.Framework
-{
-    /// <summary>
-    /// Message Server Config - Configuration of the Message Server
-    /// </summary>
-    public class MessageServerConfig:ConfigBase
-    {
-        public string DatabaseProvider = String.Empty;
-        public string DatabaseConnect = String.Empty;
-        public string GridCommsProvider = String.Empty;
-        public string GridRecvKey = String.Empty;
-        public string GridSendKey = String.Empty;
-        public string GridServerURL = String.Empty;
-        public uint HttpPort = ConfigSettings.DefaultMessageServerHttpPort;
-        public bool HttpSSL = ConfigSettings.DefaultMessageServerHttpSSL;
-        public string MessageServerIP = String.Empty;
-        public string UserRecvKey = String.Empty;
-        public string UserSendKey = String.Empty;
-        public string UserServerURL = String.Empty;
-        public string ConsoleUser = String.Empty;
-        public string ConsolePass = String.Empty;
-
-        public MessageServerConfig(string description, string filename)
-        {
-            m_configMember =
-                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
-            m_configMember.performConfigurationRetrieve();
-        }
-
-        public void loadConfigurationOptions()
-        {
-            m_configMember.addConfigurationOption("default_user_server",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "Default User Server URI",
-                                                "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString() + "/", false);
-            m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to send to user server", "null", false);
-            m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to expect from user server", "null", false);
-            m_configMember.addConfigurationOption("default_grid_server",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "Default Grid Server URI",
-                                                "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString() + "/", false);
-            m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to send to grid server", "null", false);
-            m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to expect from grid server", "null", false);
-
-            m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Connection String for Database", "", false);
-
-            m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
-
-            m_configMember.addConfigurationOption("region_comms_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false);
-
-            m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Http Listener port", ConfigSettings.DefaultMessageServerHttpPort.ToString(), false);
-            m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
-                                                "Use SSL? true/false", ConfigSettings.DefaultMessageServerHttpSSL.ToString(), false);
-            m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "My Published IP Address", "127.0.0.1", false);
-            m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Remote console access user name [Default: disabled]", "", false);
-
-            m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Remote console access password [Default: disabled]", "", false);
-
-        }
-
-        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
-        {
-            switch (configuration_key)
-            {
-                case "default_user_server":
-                    UserServerURL = (string) configuration_result;
-                    break;
-                case "user_send_key":
-                    UserSendKey = (string) configuration_result;
-                    break;
-                case "user_recv_key":
-                    UserRecvKey = (string) configuration_result;
-                    break;
-                case "default_grid_server":
-                    GridServerURL = (string) configuration_result;
-                    break;
-                case "grid_send_key":
-                    GridSendKey = (string) configuration_result;
-                    break;
-                case "grid_recv_key":
-                    GridRecvKey = (string) configuration_result;
-                    break;
-                case "database_provider":
-                    DatabaseProvider = (string) configuration_result;
-                    break;
-                case "database_connect":
-                    DatabaseConnect = (string)configuration_result;
-                    break;
-                case "http_port":
-                    HttpPort = (uint) configuration_result;
-                    break;
-                case "http_ssl":
-                    HttpSSL = (bool) configuration_result;
-                    break;
-                case "region_comms_provider":
-                    GridCommsProvider = (string) configuration_result;
-                    break;
-                case "published_ip":
-                    MessageServerIP = (string) configuration_result;
-                    break;
-                case "console_user":
-                    ConsoleUser = (string)configuration_result;
-                    break;
-                case "console_pass":
-                    ConsolePass = (string)configuration_result;
-                    break;
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/OpenSim/Framework/NetworkUtil.cs b/OpenSim/Framework/NetworkUtil.cs
index 5fe343d..831ff70 100644
--- a/OpenSim/Framework/NetworkUtil.cs
+++ b/OpenSim/Framework/NetworkUtil.cs
@@ -31,6 +31,7 @@ using System.Net.Sockets;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Reflection;
+using System.Text;
 using log4net;
 
 namespace OpenSim.Framework
@@ -180,10 +181,18 @@ namespace OpenSim.Framework
             throw new ArgumentException("[NetworkUtil] Unable to resolve defaultHostname to an IPv4 address for an IPv4 client");
         }
 
+        static IPAddress externalIPAddress;
+
         static NetworkUtil()
         {
             try
             {
+                externalIPAddress = GetExternalIP();
+            }
+            catch { /* ignore */ }
+
+            try
+            {
                 foreach (NetworkInterface ni in NetworkInterface.GetAllNetworkInterfaces())
                 {
                     foreach (UnicastIPAddressInformation address in ni.GetIPProperties().UnicastAddresses)
@@ -244,5 +253,80 @@ namespace OpenSim.Framework
             }
             return defaultHostname;
         }
+
+        public static IPAddress GetExternalIPOf(IPAddress user)
+        {
+            if (externalIPAddress == null)
+                return user;
+
+            if (user.ToString() == "127.0.0.1")
+            {
+                m_log.Info("[NetworkUtil] 127.0.0.1 user detected, sending '" + externalIPAddress + "' instead of '" + user + "'");
+                return externalIPAddress;
+            }
+            // Check if we're accessing localhost.
+            foreach (IPAddress host in Dns.GetHostAddresses(Dns.GetHostName()))
+            {
+                if (host.Equals(user) && host.AddressFamily == AddressFamily.InterNetwork)
+                {
+                    m_log.Info("[NetworkUtil] Localhost user detected, sending '" + externalIPAddress + "' instead of '" + user + "'");
+                    return externalIPAddress;
+                }
+            }
+
+            // Check for same LAN segment
+            foreach (KeyValuePair<IPAddress, IPAddress> subnet in m_subnets)
+            {
+                byte[] subnetBytes = subnet.Value.GetAddressBytes();
+                byte[] localBytes = subnet.Key.GetAddressBytes();
+                byte[] destBytes = user.GetAddressBytes();
+
+                if (subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length)
+                    return user;
+
+                bool valid = true;
+
+                for (int i = 0; i < subnetBytes.Length; i++)
+                {
+                    if ((localBytes[i] & subnetBytes[i]) != (destBytes[i] & subnetBytes[i]))
+                    {
+                        valid = false;
+                        break;
+                    }
+                }
+
+                if (subnet.Key.AddressFamily != AddressFamily.InterNetwork)
+                    valid = false;
+
+                if (valid)
+                {
+                    m_log.Info("[NetworkUtil] Local LAN user detected, sending '" + externalIPAddress + "' instead of '" + user + "'");
+                    return externalIPAddress;
+                }
+            }
+
+            // Otherwise, return user address
+            return user;
+        }
+
+        private static IPAddress GetExternalIP()
+        {
+            string whatIsMyIp = "http://www.whatismyip.com/automation/n09230945.asp";
+            WebClient wc = new WebClient();
+            UTF8Encoding utf8 = new UTF8Encoding();
+            string requestHtml = "";
+            try
+            {
+                requestHtml = utf8.GetString(wc.DownloadData(whatIsMyIp));
+            }
+            catch (WebException we)
+            {
+                m_log.Info("[NetworkUtil]: Exception in GetExternalIP: " + we.ToString());
+                return null;
+            }
+            
+            IPAddress externalIp = IPAddress.Parse(requestHtml);
+            return externalIp;
+        }
     }
 }
diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs
index 475a9de..3143e3b 100644
--- a/OpenSim/Framework/Serialization/ArchiveConstants.cs
+++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Text;
 using OpenMetaverse;
 
 namespace OpenSim.Framework.Serialization
@@ -171,6 +172,30 @@ namespace OpenSim.Framework.Serialization
         public static string CreateOarObjectPath(string objectName, UUID uuid, Vector3 pos)
         {
             return OBJECTS_PATH + CreateOarObjectFilename(objectName, uuid, pos);          
-        }        
+        }  
+        
+        /// <summary>
+        /// Extract a plain path from an IAR path
+        /// </summary>
+        /// <param name="iarPath"></param>
+        /// <returns></returns>
+        public static string ExtractPlainPathFromIarPath(string iarPath)
+        {
+            List<string> plainDirs = new List<string>();
+
+            string[] iarDirs = iarPath.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+            
+            foreach (string iarDir in iarDirs)
+            {
+                if (!iarDir.Contains(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR))
+                    plainDirs.Add(iarDir);
+                
+                int i = iarDir.LastIndexOf(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR);
+
+                plainDirs.Add(iarDir.Remove(i));
+            }
+            
+            return string.Join("/", plainDirs.ToArray());          
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Tests/ACLTest.cs b/OpenSim/Framework/Tests/ACLTest.cs
deleted file mode 100644
index 06e860e..0000000
--- a/OpenSim/Framework/Tests/ACLTest.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using NUnit.Framework;
-using System.Collections.Generic;
-
-
-namespace OpenSim.Framework.Tests
-{
-    [TestFixture]
-    public class ACLTest
-    {
-        #region Tests
-
-        /// <summary>
-        /// ACL Test class
-        /// </summary>
-        [Test]
-        public void ACLTest01()
-        {
-            ACL acl = new ACL();
-
-            Role Guests = new Role("Guests");
-            acl.AddRole(Guests);
-
-            Role[] parents = new Role[1];
-            parents[0] = Guests;
-
-            Role JoeGuest = new Role("JoeGuest", parents);
-            acl.AddRole(JoeGuest);
-
-            Resource CanBuild = new Resource("CanBuild");
-            acl.AddResource(CanBuild);
-
-
-            acl.GrantPermission("Guests", "CanBuild");
-
-            Permission perm = acl.HasPermission("JoeGuest", "CanBuild");
-            Assert.That(perm == Permission.Allow, "JoeGuest should have permission to build");
-            perm = Permission.None;
-            try
-            {
-                perm = acl.HasPermission("unknownGuest", "CanBuild");
-                
-            }
-            catch (KeyNotFoundException)
-            {
-                
-               
-            }
-            catch (Exception)
-            {
-                Assert.That(false,"Exception thrown should have been KeyNotFoundException");
-            }
-            Assert.That(perm == Permission.None,"Permission None should be set because exception should have been thrown");
-            
-        }
-
-        [Test]
-        public void KnownButPermissionDenyAndPermissionNoneUserTest()
-        {
-            ACL acl = new ACL();
-
-            Role Guests = new Role("Guests");
-            acl.AddRole(Guests);
-            Role Administrators = new Role("Administrators");
-            acl.AddRole(Administrators);
-            Role[] Guestparents = new Role[1];
-            Role[] Adminparents = new Role[1];
-
-            Guestparents[0] = Guests;
-            Adminparents[0] = Administrators;
-
-            Role JoeGuest = new Role("JoeGuest", Guestparents);
-            acl.AddRole(JoeGuest);
-
-            Resource CanBuild = new Resource("CanBuild");
-            acl.AddResource(CanBuild);
-
-            Resource CanScript = new Resource("CanScript");
-            acl.AddResource(CanScript);
-
-            Resource CanRestart = new Resource("CanRestart");
-            acl.AddResource(CanRestart);
-
-            acl.GrantPermission("Guests", "CanBuild");
-            acl.DenyPermission("Guests", "CanRestart");
-
-            acl.GrantPermission("Administrators", "CanScript");
-
-            acl.GrantPermission("Administrators", "CanRestart");
-            Permission setPermission = acl.HasPermission("JoeGuest", "CanRestart");
-            Assert.That(setPermission == Permission.Deny, "Guests Should not be able to restart");
-            Assert.That(acl.HasPermission("JoeGuest", "CanScript") == Permission.None,
-                        "No Explicit Permissions set so should be Permission.None");
-        }
-
-        #endregion
-    }
-}
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
deleted file mode 100644
index 0fa82cf..0000000
--- a/OpenSim/Framework/UserConfig.cs
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.IO;
-
-namespace OpenSim.Framework
-{
-    /// <summary>
-    /// UserConfig -- For User Server Configuration
-    /// </summary>
-    public class UserConfig:ConfigBase
-    {
-        public string DatabaseProvider = String.Empty;
-        public string DatabaseConnect = String.Empty;
-        public string DefaultStartupMsg = String.Empty;
-        public uint DefaultX = 1000;
-        public uint DefaultY = 1000;
-        public string GridRecvKey = String.Empty;
-        public string GridSendKey = String.Empty;
-        public uint HttpPort = ConfigSettings.DefaultUserServerHttpPort;
-        public bool HttpSSL = ConfigSettings.DefaultUserServerHttpSSL;
-        public uint DefaultUserLevel = 0;
-        public string LibraryXmlfile = "";
-        public string ConsoleUser = String.Empty;
-        public string ConsolePass = String.Empty;
-
-        private Uri m_inventoryUrl;
-
-        public Uri InventoryUrl
-        {
-            get
-            {
-                return m_inventoryUrl;
-            }
-            set
-            {
-                m_inventoryUrl = value;
-            }
-        }
-
-        private Uri m_authUrl;
-        public Uri AuthUrl
-        {
-            get
-            {
-                return m_authUrl;
-            }
-            set
-            {
-                m_authUrl = value;
-            }
-        }
-
-        private Uri m_gridServerURL;
-
-        public Uri GridServerURL
-        {
-            get
-            {
-                return m_gridServerURL;
-            }
-            set
-            {
-                m_gridServerURL = value;
-            }
-        }
-
-        public bool EnableLLSDLogin = true;
-
-        public bool EnableHGLogin = true;
-
-        public UserConfig()
-        {
-            // weird, but UserManagerBase needs this.
-        }
-        public UserConfig(string description, string filename)
-        {
-            m_configMember =
-                new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
-            m_configMember.performConfigurationRetrieve();
-        }
-
-        public void loadConfigurationOptions()
-        {
-            m_configMember.addConfigurationOption("default_startup_message",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "Default Startup Message", "Welcome to OGS", false);
-
-            m_configMember.addConfigurationOption("default_grid_server",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "Default Grid Server URI",
-                                                "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort + "/", false);
-            m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to send to grid server", "null", false);
-            m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Key to expect from grid server", "null", false);
-
-            m_configMember.addConfigurationOption("default_inventory_server",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "Default Inventory Server URI",
-                                                "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort + "/",
-                                                false);
-            m_configMember.addConfigurationOption("default_authentication_server",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "User Server (this) External URI for authentication keys",
-                                                "http://localhost:" + ConfigSettings.DefaultUserServerHttpPort + "/",
-                                                false);
-            m_configMember.addConfigurationOption("library_location",
-                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
-                                                "Path to library control file",
-                                                string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false);
-            
-            m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
-            m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Connection String for Database", "", false);
-
-            m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Http Listener port", ConfigSettings.DefaultUserServerHttpPort.ToString(), false);
-            m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
-                                                "Use SSL? true/false", ConfigSettings.DefaultUserServerHttpSSL.ToString(), false);
-            m_configMember.addConfigurationOption("default_X", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Known good region X", "1000", false);
-            m_configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Known good region Y", "1000", false);
-            m_configMember.addConfigurationOption("enable_llsd_login", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
-                    "Enable LLSD login support [Currently used by libsl based clients/bots]? true/false", true.ToString(), false);
-
-            m_configMember.addConfigurationOption("enable_hg_login", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
-                    "Enable Hypergrid login support [Currently used by GridSurfer-proxied clients]? true/false", true.ToString(), false);
-
-            m_configMember.addConfigurationOption("default_loginLevel", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Minimum Level a user should have to login [0 default]", "0", false);
-            
-            m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Remote console access user name [Default: disabled]", "", false);
-            
-            m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Remote console access password [Default: disabled]", "", false);
-            
-        }
-
-        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
-        {
-            switch (configuration_key)
-            {
-                case "default_startup_message":
-                    DefaultStartupMsg = (string) configuration_result;
-                    break;
-                case "default_grid_server":
-                    GridServerURL = new Uri((string) configuration_result);
-                    break;
-                case "grid_send_key":
-                    GridSendKey = (string) configuration_result;
-                    break;
-                case "grid_recv_key":
-                    GridRecvKey = (string) configuration_result;
-                    break;
-                case "default_inventory_server":
-                    InventoryUrl = new Uri((string) configuration_result);
-                    break;
-                case "default_authentication_server":
-                    AuthUrl = new Uri((string)configuration_result);
-                    break;
-                case "database_provider":
-                    DatabaseProvider = (string) configuration_result;
-                    break;
-                case "database_connect":
-                    DatabaseConnect = (string) configuration_result;
-                    break;
-                case "http_port":
-                    HttpPort = (uint) configuration_result;
-                    break;
-                case "http_ssl":
-                    HttpSSL = (bool) configuration_result;
-                    break;
-                case "default_X":
-                    DefaultX = (uint) configuration_result;
-                    break;
-                case "default_Y":
-                    DefaultY = (uint) configuration_result;
-                    break;
-                case "enable_llsd_login":
-                    EnableLLSDLogin = (bool)configuration_result;
-                    break;
-                case "enable_hg_login":
-                    EnableHGLogin = (bool)configuration_result;
-                    break;
-                case "default_loginLevel":
-                    DefaultUserLevel = (uint)configuration_result;
-                    break;
-                case "library_location":
-                    LibraryXmlfile = (string)configuration_result;
-                    break;
-                case "console_user":
-                    ConsoleUser = (string)configuration_result;
-                    break;
-                case "console_pass":
-                    ConsolePass = (string)configuration_result;
-                    break;
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index e20866e..d16f9bf 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -139,8 +139,9 @@ namespace OpenSim.Framework
                 request.ContentLength = requestData.Length;
                 request.ContentType = "application/x-www-form-urlencoded";
 
-                using (Stream requestStream = request.GetRequestStream())
-                    requestStream.Write(requestData, 0, requestData.Length);
+                Stream requestStream = request.GetRequestStream();
+                requestStream.Write(requestData, 0, requestData.Length);
+                requestStream.Close();
 
                 using (WebResponse response = request.GetResponse())
                 {
@@ -169,7 +170,7 @@ namespace OpenSim.Framework
             }
             catch (Exception ex)
             {
-                m_log.Warn("POST to URL " + url + " failed: " + ex.Message);
+                m_log.Warn("POST to URL " + url + " failed: " + ex);
                 errorMessage = ex.Message;
             }
 
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index cac5fa9..09f7bea 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -308,21 +308,6 @@ namespace OpenSim
             }
 
             {
-                IConfig config = defaultConfig.Configs["StandAlone"];
-
-                if (null == config)
-                    config = defaultConfig.AddConfig("StandAlone");
-
-                config.Set("accounts_authenticate", true);
-                config.Set("welcome_message", "Welcome to OpenSimulator");
-                config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll");
-                config.Set("inventory_source", "");
-                config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
-                config.Set("user_source", "");
-                config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar));
-            }
-
-            {
                 IConfig config = defaultConfig.Configs["Network"];
 
                 if (null == config)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
deleted file mode 100644
index 10e5a95..0000000
--- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Framework;
-
-namespace OpenSim.Region.ClientStack.LindenUDP
-{
-    /// <summary>
-    /// A work in progress, to contain the SL specific file transfer code that is currently in various region modules
-    /// This file currently contains multiple classes that need to be split out into their own files.
-    /// </summary>
-    public class LLFileTransfer : IClientFileTransfer
-    {
-        protected IClientAPI m_clientAPI;
-
-        /// Dictionary of handlers for uploading files from client
-        /// TODO: Need to add cleanup code to remove handlers that have completed their upload
-        protected Dictionary<ulong, XferUploadHandler> m_uploadHandlers;
-        protected object m_uploadHandlersLock = new object();
-
-
-        /// <summary>
-        /// Dictionary of files ready to be sent to clients
-        /// </summary>
-        protected static Dictionary<string, byte[]> m_files;
-
-        /// <summary>
-        /// Dictionary of Download Transfers in progess
-        /// </summary>
-        protected Dictionary<ulong, XferDownloadHandler> m_downloadHandlers = new Dictionary<ulong, XferDownloadHandler>();
-
-
-        public LLFileTransfer(IClientAPI clientAPI)
-        {
-            m_uploadHandlers = new Dictionary<ulong, XferUploadHandler>();
-            m_clientAPI = clientAPI;
-
-            m_clientAPI.OnXferReceive += XferReceive;
-            m_clientAPI.OnAbortXfer += AbortXferUploadHandler;
-        }
-
-        public void Close()
-        {
-            if (m_clientAPI != null)
-            {
-                m_clientAPI.OnXferReceive -= XferReceive;
-                m_clientAPI.OnAbortXfer -= AbortXferUploadHandler;
-                m_clientAPI = null;
-            }
-        }
-
-        #region Upload Handling
-
-        public bool RequestUpload(string clientFileName, UploadComplete uploadCompleteCallback, UploadAborted abortCallback)
-        {
-            if ((String.IsNullOrEmpty(clientFileName)) || (uploadCompleteCallback == null))
-            {
-                return false;
-            }
-
-            XferUploadHandler uploader = new XferUploadHandler(m_clientAPI, clientFileName);
-
-            return StartUpload(uploader, uploadCompleteCallback, abortCallback);
-        }
-
-        public bool RequestUpload(UUID fileID, UploadComplete uploadCompleteCallback, UploadAborted abortCallback)
-        {
-            if ((fileID == UUID.Zero) || (uploadCompleteCallback == null))
-            {
-                return false;
-            }
-
-            XferUploadHandler uploader = new XferUploadHandler(m_clientAPI, fileID);
-
-            return StartUpload(uploader, uploadCompleteCallback, abortCallback);
-        }
-
-        private bool StartUpload(XferUploadHandler uploader, UploadComplete uploadCompleteCallback, UploadAborted abortCallback)
-        {
-            uploader.UploadDone += uploadCompleteCallback;
-            uploader.UploadDone += RemoveXferUploadHandler;
-
-            if (abortCallback != null)
-            {
-                uploader.UploadAborted += abortCallback;
-            }
-
-            lock (m_uploadHandlersLock)
-            {
-                if (!m_uploadHandlers.ContainsKey(uploader.XferID))
-                {
-                    m_uploadHandlers.Add(uploader.XferID, uploader);
-                    uploader.RequestStartXfer(m_clientAPI);
-                    return true;
-                }
-                else
-                {
-                    // something went wrong with the xferID allocation
-                    uploader.UploadDone -= uploadCompleteCallback;
-                    uploader.UploadDone -= RemoveXferUploadHandler;
-                    if (abortCallback != null)
-                    {
-                        uploader.UploadAborted -= abortCallback;
-                    }
-                    return false;
-                }
-            }
-        }
-
-        protected void AbortXferUploadHandler(IClientAPI remoteClient, ulong xferID)
-        {
-            lock (m_uploadHandlersLock)
-            {
-                if (m_uploadHandlers.ContainsKey(xferID))
-                {
-                    m_uploadHandlers[xferID].AbortUpload(remoteClient);
-                    m_uploadHandlers.Remove(xferID);
-                }
-            }
-        }
-
-        protected void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data)
-        {
-            lock (m_uploadHandlersLock)
-            {
-                if (m_uploadHandlers.ContainsKey(xferID))
-                {
-                    m_uploadHandlers[xferID].XferReceive(remoteClient, xferID, packetID, data);
-                }
-            }
-        }
-
-        protected void RemoveXferUploadHandler(string filename, UUID fileID, ulong transferID, byte[] fileData, IClientAPI remoteClient)
-        {
-
-        }
-        #endregion
-
-    }
-
-    public class XferUploadHandler
-    {
-        private AssetBase m_asset;
-
-        public event UploadComplete UploadDone;
-        public event UploadAborted UploadAborted;
-
-        private sbyte type = 0;
-
-        public ulong mXferID;
-        private UploadComplete handlerUploadDone;
-        private UploadAborted handlerAbort;
-
-        private bool m_complete = false;
-
-        public bool UploadComplete
-        {
-            get { return m_complete; }
-        }
-
-        public XferUploadHandler(IClientAPI pRemoteClient, string pClientFilename)
-        {
-            Initialise(UUID.Zero, pClientFilename);
-        }
-
-        public XferUploadHandler(IClientAPI pRemoteClient, UUID fileID)
-        {
-            Initialise(fileID, String.Empty);
-        }
-
-        private void Initialise(UUID fileID, string fileName)
-        {
-            m_asset = new AssetBase(fileID, fileName, type, UUID.Zero.ToString());
-            m_asset.Data = new byte[0];
-            m_asset.Description = "empty";
-            m_asset.Local = true;
-            m_asset.Temporary = true;
-            mXferID = Util.GetNextXferID();
-        }
-
-        public ulong XferID
-        {
-            get { return mXferID; }
-        }
-
-        public void RequestStartXfer(IClientAPI pRemoteClient)
-        {
-            m_asset.Metadata.CreatorID = pRemoteClient.AgentId.ToString();
-
-            if (!String.IsNullOrEmpty(m_asset.Name))
-            {
-                pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, Utils.StringToBytes(m_asset.Name));
-            }
-            else
-            {
-                pRemoteClient.SendXferRequest(mXferID, m_asset.Type, m_asset.FullID, 0, new byte[0]);
-            }
-        }
-
-        /// <summary>
-        /// Process transfer data received from the client.
-        /// </summary>
-        /// <param name="xferID"></param>
-        /// <param name="packetID"></param>
-        /// <param name="data"></param>
-        public void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data)
-        {
-            if (mXferID == xferID)
-            {
-                if (m_asset.Data.Length > 1)
-                {
-                    byte[] destinationArray = new byte[m_asset.Data.Length + data.Length];
-                    Array.Copy(m_asset.Data, 0, destinationArray, 0, m_asset.Data.Length);
-                    Array.Copy(data, 0, destinationArray, m_asset.Data.Length, data.Length);
-                    m_asset.Data = destinationArray;
-                }
-                else
-                {
-                    byte[] buffer2 = new byte[data.Length - 4];
-                    Array.Copy(data, 4, buffer2, 0, data.Length - 4);
-                    m_asset.Data = buffer2;
-                }
-
-                remoteClient.SendConfirmXfer(xferID, packetID);
-
-                if ((packetID & 0x80000000) != 0)
-                {
-                    SendCompleteMessage(remoteClient);
-
-                }
-            }
-        }
-
-        protected void SendCompleteMessage(IClientAPI remoteClient)
-        {
-            m_complete = true;
-            handlerUploadDone = UploadDone;
-            if (handlerUploadDone != null)
-            {
-                handlerUploadDone(m_asset.Name, m_asset.FullID, mXferID, m_asset.Data, remoteClient);
-            }
-        }
-
-        public void AbortUpload(IClientAPI remoteClient)
-        {
-            handlerAbort = UploadAborted;
-            if (handlerAbort != null)
-            {
-                handlerAbort(m_asset.Name, m_asset.FullID, mXferID, remoteClient);
-            }
-        }
-    }
-
-    public class XferDownloadHandler
-    {
-        public IClientAPI Client;
-        private bool complete;
-        public byte[] Data = new byte[0];
-        public int DataPointer = 0;
-        public string FileName = String.Empty;
-        public uint Packet = 0;
-        public uint Serial = 1;
-        public ulong XferID = 0;
-
-        public XferDownloadHandler(string fileName, byte[] data, ulong xferID, IClientAPI client)
-        {
-            FileName = fileName;
-            Data = data;
-            XferID = xferID;
-            Client = client;
-        }
-
-        public XferDownloadHandler()
-        {
-        }
-
-        /// <summary>
-        /// Start a transfer
-        /// </summary>
-        /// <returns>True if the transfer is complete, false if not</returns>
-        public bool StartSend()
-        {
-            if (Data.Length < 1000)
-            {
-                // for now (testing) we only support files under 1000 bytes
-                byte[] transferData = new byte[Data.Length + 4];
-                Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4);
-                Array.Copy(Data, 0, transferData, 4, Data.Length);
-                Client.SendXferPacket(XferID, 0 + 0x80000000, transferData);
-
-                complete = true;
-            }
-            else
-            {
-                byte[] transferData = new byte[1000 + 4];
-                Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4);
-                Array.Copy(Data, 0, transferData, 4, 1000);
-                Client.SendXferPacket(XferID, 0, transferData);
-                Packet++;
-                DataPointer = 1000;
-            }
-
-            return complete;
-        }
-
-        /// <summary>
-        /// Respond to an ack packet from the client
-        /// </summary>
-        /// <param name="packet"></param>
-        /// <returns>True if the transfer is complete, false otherwise</returns>
-        public bool AckPacket(uint packet)
-        {
-            if (!complete)
-            {
-                if ((Data.Length - DataPointer) > 1000)
-                {
-                    byte[] transferData = new byte[1000];
-                    Array.Copy(Data, DataPointer, transferData, 0, 1000);
-                    Client.SendXferPacket(XferID, Packet, transferData);
-                    Packet++;
-                    DataPointer += 1000;
-                }
-                else
-                {
-                    byte[] transferData = new byte[Data.Length - DataPointer];
-                    Array.Copy(Data, DataPointer, transferData, 0, Data.Length - DataPointer);
-                    uint endPacket = Packet |= (uint)0x80000000;
-                    Client.SendXferPacket(XferID, endPacket, transferData);
-                    Packet++;
-                    DataPointer += (Data.Length - DataPointer);
-
-                    complete = true;
-                }
-            }
-
-            return complete;
-        }
-    }
-
-}
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index ff3036a..d895bb1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
@@ -39,38 +40,64 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.Attachments
 {
-    public class AttachmentsModule : IAttachmentsModule, IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsModule")]
+    public class AttachmentsModule : IAttachmentsModule, INonSharedRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
         protected Scene m_scene = null;
+        
+        public string Name { get { return "Attachments Module"; } }        
+        public Type ReplaceableInterface { get { return null; } }        
 
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source) {}
+        
+        public void AddRegion(Scene scene)
         {
-            scene.RegisterModuleInterface<IAttachmentsModule>(this);
             m_scene = scene;
+            m_scene.RegisterModuleInterface<IAttachmentsModule>(this);
+            m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
+            // TODO: Should probably be subscribing to CloseClient too, but this doesn't yet give us IClientAPI
         }
-
-        public void PostInitialise()
+        
+        public void RemoveRegion(Scene scene) 
         {
+            m_scene.UnregisterModuleInterface<IAttachmentsModule>(this);
+            m_scene.EventManager.OnNewClient -= SubscribeToClientEvents;
         }
-
-        public void Close()
+        
+        public void RegionLoaded(Scene scene) {}
+        
+        public void Close() 
         {
+            RemoveRegion(m_scene);
         }
-
-        public string Name
+        
+        public void SubscribeToClientEvents(IClientAPI client)
         {
-            get { return "Attachments Module"; }
+            client.OnRezSingleAttachmentFromInv += RezSingleAttachmentFromInventory;
+            client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachmentsFromInventory;
+            client.OnObjectAttach += AttachObject;
+            client.OnObjectDetach += DetachObject;
+            client.OnDetachAttachmentIntoInv += ShowDetachInUserInventory;             
         }
-
-        public bool IsSharedModule
+        
+        public void UnsubscribeFromClientEvents(IClientAPI client)
         {
-            get { return false; }
+            client.OnRezSingleAttachmentFromInv -= RezSingleAttachmentFromInventory;
+            client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachmentsFromInventory;
+            client.OnObjectAttach -= AttachObject;
+            client.OnObjectDetach -= DetachObject;
+            client.OnDetachAttachmentIntoInv -= ShowDetachInUserInventory;       
         }
-
-        // Called by client
-        //
+        
+        /// <summary>
+        /// Called by client
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="objectLocalID"></param>
+        /// <param name="AttachmentPt"></param>
+        /// <param name="silent"></param>
         public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent)
         {
             m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject");
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 50171a3..4b30b0d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -47,6 +47,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
             m_scene = scene;
             m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
             m_scene.RegisterModuleInterface<IGodsModule>(this);
+            m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
         }
         
         public void PostInitialise() {}
@@ -54,6 +55,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
         public string Name { get { return "Gods Module"; } }
         public bool IsSharedModule { get { return false; } }
         
+        public void SubscribeToClientEvents(IClientAPI client)
+        {
+            client.OnGodKickUser += KickUser;
+            client.OnRequestGodlikePowers += RequestGodlikePowers;             
+        }        
+        
+        public void UnsubscribeFromClientEvents(IClientAPI client)
+        {
+            client.OnGodKickUser -= KickUser;
+            client.OnRequestGodlikePowers -= RequestGodlikePowers;       
+        }
+        
         public void RequestGodlikePowers(
             UUID agentID, UUID sessionID, UUID token, bool godLike, IClientAPI controllingClient)
         {
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index ab141eb..a3c40e0 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -162,7 +162,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     delegate(bool success)
                     {
                         if (dialog == (uint)InstantMessageDialog.StartTyping ||
-                            dialog == (uint)InstantMessageDialog.StopTyping)
+                            dialog == (uint)InstantMessageDialog.StopTyping ||
+                            dialog == (uint)InstantMessageDialog.MessageFromObject)
                         {
                             return;
                         }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 83209fc..d025f0c 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -185,13 +185,16 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         {
             UndeliveredMessage handlerUndeliveredMessage = OnUndeliveredMessage;
 
-            // If this event has handlers, then the IM will be considered
-            // delivered. This will suppress the error message.
+            // If this event has handlers, then an IM from an agent will be
+            // considered delivered. This will suppress the error message.
             //
             if (handlerUndeliveredMessage != null)
             {
                 handlerUndeliveredMessage(im);
-                result(true);
+                if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
+                    result(true);
+                else
+                    result(false);
                 return;
             }
 
@@ -504,14 +507,14 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     //
                     if (upd.RegionID == prevRegionID)
                     {
-                        m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
+                        // m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
                         HandleUndeliveredMessage(im, result);
                         return;
                     }
                 }
                 else
                 {
-                    m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
+                    // m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
                     HandleUndeliveredMessage(im, result);
                     return;
                 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 31dfe14..7683288 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -54,6 +54,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
         private UserAccount m_userInfo;
         private string m_invPath;
+        
+        /// <summary>
+        /// Do we want to merge this load with existing inventory?
+        /// </summary>
+        protected bool m_merge;
 
         /// <value>
         /// We only use this to request modules
@@ -66,19 +71,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         private Stream m_loadStream;
 
         public InventoryArchiveReadRequest(
-            Scene scene, UserAccount userInfo, string invPath, string loadPath)
+            Scene scene, UserAccount userInfo, string invPath, string loadPath, bool merge)
             : this(
                 scene,
                 userInfo,
                 invPath,
-                new GZipStream(ArchiveHelpers.GetStream(loadPath), CompressionMode.Decompress))
+                new GZipStream(ArchiveHelpers.GetStream(loadPath), CompressionMode.Decompress),
+                merge)
         {
         }
 
         public InventoryArchiveReadRequest(
-            Scene scene, UserAccount userInfo, string invPath, Stream loadStream)
+            Scene scene, UserAccount userInfo, string invPath, Stream loadStream, bool merge)
         {
             m_scene = scene;
+            m_merge = merge;
             m_userInfo = userInfo;
             m_invPath = invPath;
             m_loadStream = loadStream;
@@ -91,7 +98,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// A list of the inventory nodes loaded.  If folders were loaded then only the root folders are
         /// returned
         /// </returns>
-        public List<InventoryNodeBase> Execute()
+        public HashSet<InventoryNodeBase> Execute()
         {
             try
             {
@@ -100,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 int failedAssetRestores = 0;
                 int successfulItemRestores = 0;
                 
-                List<InventoryNodeBase> loadedNodes = new List<InventoryNodeBase>();
+                HashSet<InventoryNodeBase> loadedNodes = new HashSet<InventoryNodeBase>();
                
                 List<InventoryFolderBase> folderCandidates
                     = InventoryArchiveUtils.FindFolderByPath(
@@ -158,9 +165,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                             {
                                 successfulItemRestores++;
                                 
-                                // If we're loading an item directly into the given destination folder then we need to record
-                                // it separately from any loaded root folders
-                                if (rootDestinationFolder == foundFolder)
+                                // If we aren't loading the folder containing the item then well need to update the 
+                                // viewer separately for that item.
+                                if (!loadedNodes.Contains(foundFolder))
                                     loadedNodes.Add(item);
                             }
                         }
@@ -205,14 +212,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             string iarPath, 
             InventoryFolderBase rootDestFolder, 
             Dictionary <string, InventoryFolderBase> resolvedFolders,
-            List<InventoryNodeBase> loadedNodes)
+            HashSet<InventoryNodeBase> loadedNodes)
         {
             string iarPathExisting = iarPath;
 
 //            m_log.DebugFormat(
 //                "[INVENTORY ARCHIVER]: Loading folder {0} {1}", rootDestFolder.Name, rootDestFolder.ID);
                         
-            InventoryFolderBase destFolder = ResolveDestinationFolder(rootDestFolder, ref iarPathExisting, resolvedFolders);
+            InventoryFolderBase destFolder 
+                = ResolveDestinationFolder(rootDestFolder, ref iarPathExisting, resolvedFolders);
             
 //            m_log.DebugFormat(
 //                "[INVENTORY ARCHIVER]: originalArchivePath [{0}], section already loaded [{1}]", 
@@ -251,46 +259,55 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {                       
 //            string originalArchivePath = archivePath;
 
-            InventoryFolderBase destFolder = null;
-
-            if (archivePath.Length > 0)
+            while (archivePath.Length > 0)
             {
-                while (null == destFolder && archivePath.Length > 0)
+                m_log.DebugFormat("[INVENTORY ARCHIVER]: Trying to resolve destination folder {0}", archivePath);
+                
+                if (resolvedFolders.ContainsKey(archivePath))
+                {
+//                    m_log.DebugFormat(
+//                        "[INVENTORY ARCHIVER]: Found previously created folder from archive path {0}", archivePath);
+                    return resolvedFolders[archivePath];
+                }
+                else
                 {
-//                    m_log.DebugFormat("[INVENTORY ARCHIVER]: Trying to resolve destination folder {0}", archivePath);
+                    if (m_merge)
+                    {
+                        // TODO: Using m_invPath is totally wrong - what we need to do is strip the uuid from the 
+                        // iar name and try to find that instead.
+                        string plainPath = ArchiveConstants.ExtractPlainPathFromIarPath(archivePath);
+                        List<InventoryFolderBase> folderCandidates
+                            = InventoryArchiveUtils.FindFolderByPath(
+                                m_scene.InventoryService, m_userInfo.PrincipalID, plainPath);
+            
+                        if (folderCandidates.Count != 0)
+                        {
+                            InventoryFolderBase destFolder = folderCandidates[0];
+                            resolvedFolders[archivePath] = destFolder;
+                            return destFolder;
+                        }
+                    }
                     
-                    if (resolvedFolders.ContainsKey(archivePath))
+                    // Don't include the last slash so find the penultimate one
+                    int penultimateSlashIndex = archivePath.LastIndexOf("/", archivePath.Length - 2);
+
+                    if (penultimateSlashIndex >= 0)
                     {
-//                        m_log.DebugFormat(
-//                            "[INVENTORY ARCHIVER]: Found previously created folder from archive path {0}", archivePath);
-                        destFolder = resolvedFolders[archivePath];
+                        // Remove the last section of path so that we can see if we've already resolved the parent
+                        archivePath = archivePath.Remove(penultimateSlashIndex + 1);
                     }
                     else
                     {
-                        // Don't include the last slash so find the penultimate one
-                        int penultimateSlashIndex = archivePath.LastIndexOf("/", archivePath.Length - 2);
-
-                        if (penultimateSlashIndex >= 0)
-                        {
-                            // Remove the last section of path so that we can see if we've already resolved the parent
-                            archivePath = archivePath.Remove(penultimateSlashIndex + 1);
-                        }
-                        else
-                        {
-//                            m_log.DebugFormat(
-//                                "[INVENTORY ARCHIVER]: Found no previously created folder for archive path {0}",
-//                                originalArchivePath);
-                            archivePath = string.Empty;
-                            destFolder = rootDestFolder;
-                        }
+//                        m_log.DebugFormat(
+//                            "[INVENTORY ARCHIVER]: Found no previously created folder for archive path {0}",
+//                            originalArchivePath);
+                        archivePath = string.Empty;
+                        return rootDestFolder;
                     }
                 }
             }
             
-            if (null == destFolder)
-                destFolder = rootDestFolder;
-            
-            return destFolder;
+            return rootDestFolder;
         }
         
         /// <summary>
@@ -316,24 +333,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             string iarPathExisting,
             string iarPathToReplicate, 
             Dictionary <string, InventoryFolderBase> resolvedFolders, 
-            List<InventoryNodeBase> loadedNodes)
+            HashSet<InventoryNodeBase> loadedNodes)
         {
             string[] rawDirsToCreate = iarPathToReplicate.Split(new char[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
-            int i = 0;
 
-            while (i < rawDirsToCreate.Length)
+            for (int i = 0; i < rawDirsToCreate.Length; i++)
             {
 //                m_log.DebugFormat("[INVENTORY ARCHIVER]: Creating folder {0} from IAR", rawDirsToCreate[i]);
 
+                if (!rawDirsToCreate[i].Contains(ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR))
+                    continue;
+                
                 int identicalNameIdentifierIndex
                     = rawDirsToCreate[i].LastIndexOf(
                         ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR);
 
-                if (identicalNameIdentifierIndex < 0)
-                {
-                    i++;
-                    continue;
-                }
                 string newFolderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex);
 
                 newFolderName = InventoryArchiveUtils.UnescapeArchivePath(newFolderName);
@@ -356,8 +370,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                 if (0 == i)
                     loadedNodes.Add(destFolder);
-
-                i++;
             }            
         }
         
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index f7a2b09..f03f2a1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -91,12 +91,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 
                 scene.AddCommand(
                     this, "load iar",
-                                        "load iar <first> <last> <inventory path> <password> [<IAR path>]",                                              
+                    "load iar <first> <last> <inventory path> <password> [<IAR path>]",                              
                     //"load iar [--merge] <first> <last> <inventory path> <password> [<IAR path>]",
                     "Load user inventory archive (IAR).",
-                                    //"--merge is an option which merges the loaded IAR with existing inventory folders where possible, rather than always creating new ones"
+                    //"--merge is an option which merges the loaded IAR with existing inventory folders where possible, rather than always creating new ones"
                     //+ "<first> is user's first name." + Environment.NewLine
-                    "<first> is user's first name." + Environment.NewLine                                                
+                    "<first> is user's first name." + Environment.NewLine                                
                     + "<last> is user's last name." + Environment.NewLine
                     + "<inventory path> is the path inside the user's inventory where the IAR should be loaded." + Environment.NewLine
                     + "<password> is the user's password." + Environment.NewLine
@@ -136,16 +136,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             if (handlerInventoryArchiveSaved != null)
                 handlerInventoryArchiveSaved(id, succeeded, userInfo, invPath, saveStream, reportedException);
         }
-                
+        
         public bool ArchiveInventory(
-                     Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream)
-                {
-                        return ArchiveInventory(id, firstName, lastName, invPath, pass, saveStream, new Dictionary<string, object>());
-                }
+             Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream)
+        {
+            return ArchiveInventory(id, firstName, lastName, invPath, pass, saveStream, new Dictionary<string, object>());
+        }
 
         public bool ArchiveInventory(
-                    Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream, 
-                    Dictionary<string, object> options)
+            Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream, 
+            Dictionary<string, object> options)
         {
             if (m_scenes.Count > 0)
             {
@@ -184,8 +184,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         }
                         
         public bool ArchiveInventory(
-                    Guid id, string firstName, string lastName, string invPath, string pass, string savePath, 
-                    Dictionary<string, object> options)
+            Guid id, string firstName, string lastName, string invPath, string pass, string savePath, 
+            Dictionary<string, object> options)
         {
             if (m_scenes.Count > 0)
             {
@@ -224,13 +224,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         }
 
         public bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, Stream loadStream)
-                {
-                        return DearchiveInventory(firstName, lastName, invPath, pass, loadStream, new Dictionary<string, object>());
-                }
-                
+        {
+            return DearchiveInventory(firstName, lastName, invPath, pass, loadStream, new Dictionary<string, object>());
+        }
+        
         public bool DearchiveInventory(
-                    string firstName, string lastName, string invPath, string pass, Stream loadStream, 
-                    Dictionary<string, object> options)
+            string firstName, string lastName, string invPath, string pass, Stream loadStream, 
+            Dictionary<string, object> options)
         {
             if (m_scenes.Count > 0)
             {
@@ -241,10 +241,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     if (CheckPresence(userInfo.PrincipalID))
                     {
                         InventoryArchiveReadRequest request;
+                        bool merge = (options.ContainsKey("merge") ? (bool)options["merge"] : false);                        
                         
                         try
                         {
-                            request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream);
+                            request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream, merge);
                         }
                         catch (EntryPointNotFoundException e)
                         {
@@ -273,8 +274,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         }
         
         public bool DearchiveInventory(
-                     string firstName, string lastName, string invPath, string pass, string loadPath, 
-                     Dictionary<string, object> options)
+             string firstName, string lastName, string invPath, string pass, string loadPath, 
+             Dictionary<string, object> options)
         {
             if (m_scenes.Count > 0)
             {
@@ -285,10 +286,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     if (CheckPresence(userInfo.PrincipalID))
                     {
                         InventoryArchiveReadRequest request;
+                        bool merge = (options.ContainsKey("merge") ? (bool)options["merge"] : false);                        
                         
                         try
-                        {
-                            request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath);
+                        {                            
+                            request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath, merge);
                         }
                         catch (EntryPointNotFoundException e)
                         {
@@ -334,7 +336,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 if (mainParams.Count < 6)
                 {
                     m_log.Error(
-                        "[INVENTORY ARCHIVER]: usage is load iar <first name> <last name> <inventory path> <user password> [<load file path>]");
+                        "[INVENTORY ARCHIVER]: usage is load iar [--merge] <first name> <last name> <inventory path> <user password> [<load file path>]");
                     return;
                 }            
     
@@ -356,7 +358,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             catch (InventoryArchiverException e)
             {
                 m_log.ErrorFormat("[INVENTORY ARCHIVER]: {0}", e.Message);
-            }                
+            }
         }
         
         /// <summary>
@@ -469,7 +471,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// Notify the client of loaded nodes if they are logged in
         /// </summary>
         /// <param name="loadedNodes">Can be empty.  In which case, nothing happens</param>
-        private void UpdateClientWithLoadedNodes(UserAccount userInfo, List<InventoryNodeBase> loadedNodes)
+        private void UpdateClientWithLoadedNodes(UserAccount userInfo, HashSet<InventoryNodeBase> loadedNodes)
         {
             if (loadedNodes.Count == 0)
                 return;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 4531bfd..2d80382 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -629,7 +629,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             UserAccount ua1 = UserProfileTestUtils.CreateUserWithInventory(scene);
             
             Dictionary <string, InventoryFolderBase> foldersCreated = new Dictionary<string, InventoryFolderBase>();
-            List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>();
+            HashSet<InventoryNodeBase> nodesLoaded = new HashSet<InventoryNodeBase>();
             
             string folder1Name = "1";
             string folder2aName = "2a";
@@ -644,7 +644,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             {
                 // Test replication of path1
-                new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null)
+                new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null, false)
                     .ReplicateArchivePathToUserInventory(
                         iarPath1, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
                         foldersCreated, nodesLoaded);
@@ -661,7 +661,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             
             {
                 // Test replication of path2
-                new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null)
+                new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null, false)
                     .ReplicateArchivePathToUserInventory(
                         iarPath2, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
                         foldersCreated, nodesLoaded);
@@ -707,10 +707,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             
             string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName });
             
-            new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null)
+            new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null, false)
                 .ReplicateArchivePathToUserInventory(
                     itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
-                    new Dictionary<string, InventoryFolderBase>(), new List<InventoryNodeBase>());
+                    new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>());
 
             List<InventoryFolderBase> folder1PostCandidates 
                 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
@@ -732,5 +732,45 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1Post, "b");
             Assert.That(folder2PostCandidates.Count, Is.EqualTo(1));
         }       
+        
+        /// <summary>
+        /// Test replication of a partly existing archive path to the user's inventory.  This should create
+        /// a merged path.
+        /// </summary>
+        [Test]
+        public void TestMergeIarPath()
+        {
+            TestHelper.InMethod();
+            log4net.Config.XmlConfigurator.Configure();
+            
+            Scene scene = SceneSetupHelpers.SetupScene("inventory");
+            UserAccount ua1 = UserProfileTestUtils.CreateUserWithInventory(scene);
+            
+            string folder1ExistingName = "a";
+            string folder2Name = "b";
+            
+            InventoryFolderBase folder1 
+                = UserInventoryTestUtils.CreateInventoryFolder(
+                    scene.InventoryService, ua1.PrincipalID, folder1ExistingName);            
+            
+            string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1ExistingName, UUID.Random());
+            string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random());
+            
+            string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName });
+            
+            new InventoryArchiveReadRequest(scene, ua1, folder1ExistingName, (Stream)null, true)
+                .ReplicateArchivePathToUserInventory(
+                    itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
+                    new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>());
+
+            List<InventoryFolderBase> folder1PostCandidates 
+                = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
+            Assert.That(folder1PostCandidates.Count, Is.EqualTo(1));
+            Assert.That(folder1PostCandidates[0].ID, Is.EqualTo(folder1.ID));
+
+            List<InventoryFolderBase> folder2PostCandidates 
+                = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1PostCandidates[0], "b");
+            Assert.That(folder2PostCandidates.Count, Is.EqualTo(1));
+        }           
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
index 36dae6b..9c20d68 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -173,16 +173,16 @@ namespace OpenSim.Region.CoreModules.Framework.Library
                 m_log.InfoFormat("[LIBRARY MODULE]: Loading library archive {0} ({1})...", iarFileName, simpleName);
                 simpleName = GetInventoryPathFromName(simpleName);
 
-                InventoryArchiveReadRequest archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, simpleName, iarFileName);
+                InventoryArchiveReadRequest archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, simpleName, iarFileName, false);
                 try
                 {
-                    List<InventoryNodeBase> nodes = archread.Execute();
+                    HashSet<InventoryNodeBase> nodes = archread.Execute();
                     if (nodes != null && nodes.Count == 0)
                     {
                         // didn't find the subfolder with the given name; place it on the top
                         m_log.InfoFormat("[LIBRARY MODULE]: Didn't find {0} in library. Placing archive on the top level", simpleName);
                         archread.Close();
-                        archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, "/", iarFileName);
+                        archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, "/", iarFileName, false);
                         archread.Execute();
                     }
                     foreach (InventoryNodeBase node in nodes)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 2a87da2..6864629 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -283,6 +283,9 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public bool IsBannedFromLand(UUID avatar)
         {
+            if (m_scene.Permissions.IsAdministrator(avatar))
+                return false;
+
             if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0)
             {
                 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
@@ -301,6 +304,9 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public bool IsRestrictedFromLand(UUID avatar)
         {
+            if (m_scene.Permissions.IsAdministrator(avatar))
+                return false;
+
             if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0)
             {
                 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 8549b36..82ad109 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -59,9 +59,7 @@ namespace OpenSim.Region.CoreModules.Media.Moap
         
         public string Name { get { return "MoapModule"; } }                
         public Type ReplaceableInterface { get { return null; } }        
-        
-        public const string MEDIA_TEXTURE_TYPE = "sl";
-        
+
         /// <summary>
         /// Is this module enabled?
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 3a642f4..bc54997 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -210,6 +210,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
             m_scene.Permissions.OnDeedParcel += CanDeedParcel;
             m_scene.Permissions.OnDeedObject += CanDeedObject;
             m_scene.Permissions.OnIsGod += IsGod;
+            m_scene.Permissions.OnIsAdministrator += IsAdministrator;
             m_scene.Permissions.OnDuplicateObject += CanDuplicateObject;
             m_scene.Permissions.OnDeleteObject += CanDeleteObject; //MAYBE FULLY IMPLEMENTED
             m_scene.Permissions.OnEditObject += CanEditObject; //MAYBE FULLY IMPLEMENTED
diff --git a/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs
index e23be59..36917e9 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs
@@ -30,7 +30,7 @@ using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
 using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects
+namespace OpenSim.Region.CoreModules.World.Terrain.Effects
 {
     public class ChannelDigger : ITerrainEffect
     {
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 1e7ea7b..2c5e444 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         #endregion
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
+        
         private readonly Commander m_commander = new Commander("terrain");
 
         private readonly Dictionary<StandardTerrainEffects, ITerrainFloodEffect> m_floodeffects =
@@ -381,8 +381,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain
         private void LoadPlugins()
         {
             m_plugineffects = new Dictionary<string, ITerrainEffect>();
+            string plugineffectsPath = "Terrain";
+            
             // Load the files in the Terrain/ dir
-            string[] files = Directory.GetFiles("Terrain");
+            if (!Directory.Exists(plugineffectsPath))
+                return;
+            
+            string[] files = Directory.GetFiles(plugineffectsPath);
             foreach (string file in files)
             {
                 m_log.Info("Loading effects in " + file);
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index de4c5fb..a90e0f3 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID))
                 {
                     // 16384 is CHANGED_ANIMATION
-                    m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { 16384 });
+                    m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { (int)Changed.ANIMATION});
                     SendAnimPack();
                 }
             }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index 0033900..4e80bf2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Region.Framework.Scenes
     public delegate bool RunConsoleCommandHandler(UUID user, Scene requestFromScene);
     public delegate bool IssueEstateCommandHandler(UUID user, Scene requestFromScene, bool ownerCommand);
     public delegate bool IsGodHandler(UUID user, Scene requestFromScene);
+    public delegate bool IsAdministratorHandler(UUID user);
     public delegate bool EditParcelHandler(UUID user, ILandObject parcel, Scene scene);
     public delegate bool SellParcelHandler(UUID user, ILandObject parcel, Scene scene);
     public delegate bool AbandonParcelHandler(UUID user, ILandObject parcel, Scene scene);
@@ -124,6 +125,7 @@ namespace OpenSim.Region.Framework.Scenes
         public event RunConsoleCommandHandler OnRunConsoleCommand;
         public event IssueEstateCommandHandler OnIssueEstateCommand;
         public event IsGodHandler OnIsGod;
+        public event IsAdministratorHandler OnIsAdministrator;
         public event EditParcelHandler OnEditParcel;
         public event SellParcelHandler OnSellParcel;
         public event AbandonParcelHandler OnAbandonParcel;
@@ -656,6 +658,21 @@ namespace OpenSim.Region.Framework.Scenes
             }
             return true;
         }
+
+        public bool IsAdministrator(UUID user)
+        {
+            IsAdministratorHandler handler = OnIsAdministrator;
+            if (handler != null)
+            {
+                Delegate[] list = handler.GetInvocationList();
+                foreach (IsAdministratorHandler h in list)
+                {
+                    if (h(user) == false)
+                        return false;
+                }
+            }
+            return true;
+        }
         #endregion
 
         #region EDIT PARCEL
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index e8dce08..dcd7f3d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2727,7 +2727,9 @@ namespace OpenSim.Region.Framework.Scenes
                 IUserAgentVerificationModule userVerification = RequestModuleInterface<IUserAgentVerificationModule>();
                 if (userVerification != null && ep != null)
                 {
-                    if (!userVerification.VerifyClient(aCircuit, ep.Address.ToString()))
+                    System.Net.IPAddress addr = NetworkUtil.GetExternalIPOf(ep.Address);
+
+                    if (!userVerification.VerifyClient(aCircuit, /*ep.Address.ToString() */ addr.ToString()))
                     {
                         // uh-oh, this is fishy
                         m_log.DebugFormat("[Scene]: User Client Verification for {0} {1} in {2} returned false", aCircuit.firstname, aCircuit.lastname, RegionInfo.RegionName);
@@ -2785,17 +2787,11 @@ namespace OpenSim.Region.Framework.Scenes
             SubscribeToClientPrimEvents(client);
             SubscribeToClientPrimRezEvents(client);
             SubscribeToClientInventoryEvents(client);
-            SubscribeToClientAttachmentEvents(client);
             SubscribeToClientTeleportEvents(client);
             SubscribeToClientScriptEvents(client);
             SubscribeToClientParcelEvents(client);
             SubscribeToClientGridEvents(client);
-            SubscribeToClientGodEvents(client);
-
             SubscribeToClientNetworkEvents(client);
-            
-
-            // EventManager.TriggerOnNewClient(client);
         }
 
         public virtual void SubscribeToClientTerrainEvents(IClientAPI client)
@@ -2805,8 +2801,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
         
         public virtual void SubscribeToClientPrimEvents(IClientAPI client)
-        {
-            
+        {            
             client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimPosition;
             client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition;
             client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimRotation;
@@ -2876,18 +2871,6 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnMoveTaskItem += ClientMoveTaskInventoryItem;
         }
 
-        public virtual void SubscribeToClientAttachmentEvents(IClientAPI client)
-        {                                    
-            if (AttachmentsModule != null)
-            {
-                client.OnRezSingleAttachmentFromInv += AttachmentsModule.RezSingleAttachmentFromInventory;
-                client.OnRezMultipleAttachmentsFromInv += AttachmentsModule.RezMultipleAttachmentsFromInventory;
-                client.OnObjectAttach += AttachmentsModule.AttachObject;
-                client.OnObjectDetach += AttachmentsModule.DetachObject;
-                client.OnDetachAttachmentIntoInv += AttachmentsModule.ShowDetachInUserInventory;
-            }
-        }
-
         public virtual void SubscribeToClientTeleportEvents(IClientAPI client)
         {
             client.OnTeleportLocationRequest += RequestTeleportLocation;
@@ -2917,44 +2900,29 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnSetStartLocationRequest += SetHomeRezPoint;
             client.OnRegionHandleRequest += RegionHandleRequest;
         }
-
-        public virtual void SubscribeToClientGodEvents(IClientAPI client)
-        {
-            IGodsModule godsModule = RequestModuleInterface<IGodsModule>();
-            client.OnGodKickUser += godsModule.KickUser;
-            client.OnRequestGodlikePowers += godsModule.RequestGodlikePowers;
-        }
-
+        
         public virtual void SubscribeToClientNetworkEvents(IClientAPI client)
         {
             client.OnNetworkStatsUpdate += StatsReporter.AddPacketsStats;
             client.OnViewerEffect += ProcessViewerEffect;
         }
 
-        protected virtual void UnsubscribeToClientEvents(IClientAPI client)
-        {
-        }
-
         /// <summary>
-        /// Register for events from the client
+        /// Unsubscribe the client from events.
         /// </summary>
-        /// <param name="client">The IClientAPI of the connected client</param>
+        /// FIXME: Not called anywhere!
+        /// <param name="client">The IClientAPI of the client</param>
         public virtual void UnSubscribeToClientEvents(IClientAPI client)
         {
             UnSubscribeToClientTerrainEvents(client);
             UnSubscribeToClientPrimEvents(client);
             UnSubscribeToClientPrimRezEvents(client);
             UnSubscribeToClientInventoryEvents(client);
-            UnSubscribeToClientAttachmentEvents(client);
             UnSubscribeToClientTeleportEvents(client);
             UnSubscribeToClientScriptEvents(client);
             UnSubscribeToClientParcelEvents(client);
             UnSubscribeToClientGridEvents(client);
-            UnSubscribeToClientGodEvents(client);
-
             UnSubscribeToClientNetworkEvents(client);
-
-            // EventManager.TriggerOnNewClient(client);
         }
 
         public virtual void UnSubscribeToClientTerrainEvents(IClientAPI client)
@@ -3031,18 +2999,6 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnMoveTaskItem -= ClientMoveTaskInventoryItem;
         }
 
-        public virtual void UnSubscribeToClientAttachmentEvents(IClientAPI client)
-        {            
-            if (AttachmentsModule != null)
-            {
-                client.OnRezSingleAttachmentFromInv -= AttachmentsModule.RezSingleAttachmentFromInventory;
-                client.OnRezMultipleAttachmentsFromInv -= AttachmentsModule.RezMultipleAttachmentsFromInventory;
-                client.OnObjectAttach -= AttachmentsModule.AttachObject;
-                client.OnObjectDetach -= AttachmentsModule.DetachObject;
-                client.OnDetachAttachmentIntoInv -= AttachmentsModule.ShowDetachInUserInventory;
-            }
-        }
-
         public virtual void UnSubscribeToClientTeleportEvents(IClientAPI client)
         {
             client.OnTeleportLocationRequest -= RequestTeleportLocation;
@@ -3074,13 +3030,6 @@ namespace OpenSim.Region.Framework.Scenes
             client.OnRegionHandleRequest -= RegionHandleRequest;
         }
 
-        public virtual void UnSubscribeToClientGodEvents(IClientAPI client)
-        {
-            IGodsModule godsModule = RequestModuleInterface<IGodsModule>();
-            client.OnGodKickUser -= godsModule.KickUser;
-            client.OnRequestGodlikePowers -= godsModule.RequestGodlikePowers;
-        }
-
         public virtual void UnSubscribeToClientNetworkEvents(IClientAPI client)
         {
             client.OnNetworkStatsUpdate -= StatsReporter.AddPacketsStats;
@@ -5294,4 +5243,4 @@ namespace OpenSim.Region.Framework.Scenes
             return offsets.ToArray();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 40332a6..f47450f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -78,8 +78,6 @@ namespace OpenSim.Region.Framework.Scenes
 //        protected internal Dictionary<UUID, EntityBase> Entities = new Dictionary<UUID, EntityBase>();
         protected internal Dictionary<UUID, ScenePresence> RestorePresences = new Dictionary<UUID, ScenePresence>();
 
-        protected internal BasicQuadTreeNode QuadTree;
-
         protected RegionInfo m_regInfo;
         protected Scene m_parentScene;
         protected Dictionary<UUID, SceneObjectGroup> m_updateList = new Dictionary<UUID, SceneObjectGroup>();
@@ -107,9 +105,6 @@ namespace OpenSim.Region.Framework.Scenes
         {
             m_parentScene = parent;
             m_regInfo = regInfo;
-            QuadTree = new BasicQuadTreeNode(null, "/0/", 0, 0, (short)Constants.RegionSize, (short)Constants.RegionSize);
-            QuadTree.Subdivide();
-            QuadTree.Subdivide();
         }
 
         public PhysicsScene PhysicsScene
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 32332f7..3dac0ad 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -56,10 +56,11 @@ namespace OpenSim.Region.Framework.Scenes
         LINK = 32,
         ALLOWED_DROP = 64,
         OWNER = 128,
-        REGION_RESTART = 256,
-        REGION = 512,
-        TELEPORT = 1024,
-        MEDIA = 2048
+        REGION = 256,
+        TELEPORT = 512,
+        REGION_RESTART = 1024,
+        MEDIA = 2048,
+        ANIMATION = 16384
     }
 
     // I don't really know where to put this except here.
@@ -871,7 +872,6 @@ namespace OpenSim.Region.Framework.Scenes
             set
             {
                 m_color = value;
-                TriggerScriptChangedEvent(Changed.COLOR);
 
                 /* ScheduleFullUpdate() need not be called b/c after
                  * setting the color, the text will be set, so then
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1e8ce22..4c17615 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -929,7 +929,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void MakeChildAgent()
         {
-            Animator.ResetAnimations();
+            // It looks like m_animator is set to null somewhere, and MakeChild
+            // is called after that. Probably in aborted teleports.
+            if (m_animator == null)
+                m_animator = new ScenePresenceAnimator(this);
+            else
+                Animator.ResetAnimations();
 
 //            m_log.DebugFormat(
 //                 "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",
@@ -3455,7 +3460,7 @@ namespace OpenSim.Region.Framework.Scenes
                             if (m == null) // No script engine loaded
                                 continue;
 
-                            m.PostObjectEvent(grp.RootPart.UUID, "changed", new Object[] { 16384 });
+                            m.PostObjectEvent(grp.RootPart.UUID, "changed", new Object[] { (int)Changed.ANIMATION });
                         }
                     }
                 }
diff --git a/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs b/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
deleted file mode 100644
index 38a9203..0000000
--- a/OpenSim/Region/Framework/Scenes/Types/BasicQuadTreeNode.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using OpenSim.Region.Framework.Scenes;
-
-namespace OpenSim.Region.Framework.Scenes.Types
-{
-    public class BasicQuadTreeNode
-    {
-        private List<SceneObjectGroup> m_objects = new List<SceneObjectGroup>();
-        private BasicQuadTreeNode[] m_childNodes = null;
-        private BasicQuadTreeNode m_parent = null;
-
-        private short m_leftX;
-        private short m_leftY;
-        private short m_width;
-        private short m_height;
-        //private int m_quadNumber;
-        private string m_quadID;
-
-        public BasicQuadTreeNode(BasicQuadTreeNode parent, string quadID, short leftX, short leftY, short width,
-                                 short height)
-        {
-            m_parent = parent;
-            m_quadID = quadID;
-            m_leftX = leftX;
-            m_leftY = leftY;
-            m_width = width;
-            m_height = height;
-            // m_log.Debug("creating quadtree node " + m_quadID);
-        }
-
-        public void AddObject(SceneObjectGroup obj)
-        {
-            if (m_childNodes == null)
-            {
-                if (!m_objects.Contains(obj))
-                {
-                    m_objects.Add(obj);
-                }
-            }
-            else
-            {
-                if (obj.AbsolutePosition.X < (m_leftX + (m_width/2)))
-                {
-                    if (obj.AbsolutePosition.Y < (m_leftY + (m_height/2)))
-                    {
-                        m_childNodes[0].AddObject(obj);
-                    }
-                    else
-                    {
-                        m_childNodes[2].AddObject(obj);
-                    }
-                }
-                else
-                {
-                    if (obj.AbsolutePosition.Y < (m_leftY + (m_height/2)))
-                    {
-                        m_childNodes[1].AddObject(obj);
-                    }
-                    else
-                    {
-                        m_childNodes[3].AddObject(obj);
-                    }
-                }
-            }
-        }
-
-        public void Subdivide()
-        {
-            if (m_childNodes == null)
-            {
-                m_childNodes = new BasicQuadTreeNode[4];
-                m_childNodes[0] =
-                    new BasicQuadTreeNode(this, m_quadID + "1/", m_leftX, m_leftY, (short) (m_width/2),
-                                          (short) (m_height/2));
-                m_childNodes[1] =
-                    new BasicQuadTreeNode(this, m_quadID + "2/", (short) (m_leftX + (m_width/2)), m_leftY,
-                                          (short) (m_width/2), (short) (m_height/2));
-                m_childNodes[2] =
-                    new BasicQuadTreeNode(this, m_quadID + "3/", m_leftX, (short) (m_leftY + (m_height/2)),
-                                          (short) (m_width/2), (short) (m_height/2));
-                m_childNodes[3] =
-                    new BasicQuadTreeNode(this, m_quadID + "4/", (short) (m_leftX + (m_width/2)),
-                                          (short) (m_height + (m_height/2)), (short) (m_width/2), (short) (m_height/2));
-            }
-            else
-            {
-                for (int i = 0; i < m_childNodes.Length; i++)
-                {
-                    m_childNodes[i].Subdivide();
-                }
-            }
-        }
-
-        public List<SceneObjectGroup> GetObjectsFrom(float x, float y)
-        {
-            if (m_childNodes == null)
-            {
-                return new List<SceneObjectGroup>(m_objects);
-            }
-            else
-            {
-                if (x < m_leftX + (m_width/2))
-                {
-                    if (y < m_leftY + (m_height/2))
-                    {
-                        return m_childNodes[0].GetObjectsFrom(x, y);
-                    }
-                    else
-                    {
-                        return m_childNodes[2].GetObjectsFrom(x, y);
-                    }
-                }
-                else
-                {
-                    if (y < m_leftY + (m_height/2))
-                    {
-                        return m_childNodes[1].GetObjectsFrom(x, y);
-                    }
-                    else
-                    {
-                        return m_childNodes[3].GetObjectsFrom(x, y);
-                    }
-                }
-            }
-        }
-
-        public List<SceneObjectGroup> GetObjectsFrom(string nodeName)
-        {
-            if (nodeName == m_quadID)
-            {
-                return new List<SceneObjectGroup>(m_objects);
-            }
-            else if (m_childNodes != null)
-            {
-                for (int i = 0; i < 4; i++)
-                {
-                    List<SceneObjectGroup> retVal;
-                    retVal = m_childNodes[i].GetObjectsFrom(nodeName);
-                    if (retVal != null)
-                    {
-                        return retVal;
-                    }
-                }
-            }
-            return null;
-        }
-
-        public string GetNodeID(float x, float y)
-        {
-            if (m_childNodes == null)
-            {
-                return m_quadID;
-            }
-            else
-            {
-                if (x < m_leftX + (m_width/2))
-                {
-                    if (y < m_leftY + (m_height/2))
-                    {
-                        return m_childNodes[0].GetNodeID(x, y);
-                    }
-                    else
-                    {
-                        return m_childNodes[2].GetNodeID(x, y);
-                    }
-                }
-                else
-                {
-                    if (y < m_leftY + (m_height/2))
-                    {
-                        return m_childNodes[1].GetNodeID(x, y);
-                    }
-                    else
-                    {
-                        return m_childNodes[3].GetNodeID(x, y);
-                    }
-                }
-            }
-        }
-
-        public void Update()
-        {
-            if (m_childNodes != null)
-            {
-                for (int i = 0; i < 4; i++)
-                {
-                    m_childNodes[i].Update();
-                }
-            }
-            else
-            {
-                List<SceneObjectGroup> outBounds = new List<SceneObjectGroup>();
-                foreach (SceneObjectGroup group in m_objects)
-                {
-                    if (((group.AbsolutePosition.X > m_leftX) && (group.AbsolutePosition.X < (m_leftX + m_width))) &&
-                        ((group.AbsolutePosition.Y > m_leftY) && (group.AbsolutePosition.Y < (m_leftY + m_height))))
-                    {
-                        //still in bounds
-                    }
-                    else
-                    {
-                        outBounds.Add(group);
-                    }
-                }
-
-                foreach (SceneObjectGroup removee in outBounds)
-                {
-                    m_objects.Remove(removee);
-                    if (m_parent != null)
-                    {
-                        m_parent.PassUp(removee);
-                    }
-                }
-                outBounds.Clear();
-            }
-        }
-
-        public void PassUp(SceneObjectGroup group)
-        {
-            if (((group.AbsolutePosition.X > m_leftX) && (group.AbsolutePosition.X < (m_leftX + m_width))) &&
-                ((group.AbsolutePosition.Y > m_leftY) && (group.AbsolutePosition.Y < (m_leftY + m_height))))
-            {
-                AddObject(group);
-            }
-            else
-            {
-                if (m_parent != null)
-                {
-                    m_parent.PassUp(group);
-                }
-            }
-        }
-
-        public string[] GetNeighbours(string nodeName)
-        {
-            string[] retVal = new string[1];
-            retVal[0] = String.Empty;
-            return retVal;
-        }
-    }
-}
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
index 9d41c9c..a0d6197 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
@@ -28,11 +28,14 @@
 using System;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Avatar.Attachments;
+using OpenSim.Region.CoreModules.Avatar.Gods;
+using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.RegionCombinerModule
 {
- public class RegionCombinerIndividualEventForwarder
+    public class RegionCombinerIndividualEventForwarder
     {
         private Scene m_rootScene;
         private Scene m_virtScene;
@@ -46,22 +49,31 @@ namespace OpenSim.Region.RegionCombinerModule
         public void ClientConnect(IClientAPI client)
         {
             m_virtScene.UnSubscribeToClientPrimEvents(client);
-            m_virtScene.UnSubscribeToClientPrimRezEvents(client);
+            m_virtScene.UnSubscribeToClientPrimRezEvents(client);            
             m_virtScene.UnSubscribeToClientInventoryEvents(client);
-            m_virtScene.UnSubscribeToClientAttachmentEvents(client);
+            ((AttachmentsModule)m_virtScene.AttachmentsModule).UnsubscribeFromClientEvents(client);
             //m_virtScene.UnSubscribeToClientTeleportEvents(client);
             m_virtScene.UnSubscribeToClientScriptEvents(client);
-            m_virtScene.UnSubscribeToClientGodEvents(client);
+            
+            IGodsModule virtGodsModule = m_virtScene.RequestModuleInterface<IGodsModule>();
+            if (virtGodsModule != null)
+                ((GodsModule)virtGodsModule).UnsubscribeFromClientEvents(client);
+            
             m_virtScene.UnSubscribeToClientNetworkEvents(client);
 
             m_rootScene.SubscribeToClientPrimEvents(client);
             client.OnAddPrim += LocalAddNewPrim;
             client.OnRezObject += LocalRezObject;
+            
             m_rootScene.SubscribeToClientInventoryEvents(client);
-            m_rootScene.SubscribeToClientAttachmentEvents(client);
+            ((AttachmentsModule)m_rootScene.AttachmentsModule).SubscribeToClientEvents(client);            
             //m_rootScene.SubscribeToClientTeleportEvents(client);
             m_rootScene.SubscribeToClientScriptEvents(client);
-            m_rootScene.SubscribeToClientGodEvents(client);
+            
+            IGodsModule rootGodsModule = m_virtScene.RequestModuleInterface<IGodsModule>();
+            if (rootGodsModule != null)
+                ((GodsModule)rootGodsModule).UnsubscribeFromClientEvents(client);
+            
             m_rootScene.SubscribeToClientNetworkEvents(client);
         }
 
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index 9f6ea35..0c99d8c 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -38,10 +38,11 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
 {
     public enum StateSource
     {
-        NewRez = 0,
-        PrimCrossing = 1,
-        ScriptedRez = 2,
-        AttachedRez = 3
+        RegionStart = 0,
+        NewRez = 1,
+        PrimCrossing = 2,
+        ScriptedRez = 3,
+        AttachedRez = 4
     }
 
     public interface IScriptWorkItem
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8903c3b..139b4f1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -68,6 +68,14 @@ using System.Reflection;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Api
 {
+    // MUST be a ref type
+    public class UserInfoCacheEntry
+    {
+        public int time;
+        public UserAccount account;
+        public PresenceInfo pinfo;
+    }
+
     /// <summary>
     /// Contains all LSL ll-functions. This class will be in Default AppDomain.
     /// </summary>
@@ -92,6 +100,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         protected int m_scriptConsoleChannel = 0;
         protected bool m_scriptConsoleChannelEnabled = false;
         protected IUrlModule m_UrlModule = null;
+        protected Dictionary<UUID, UserInfoCacheEntry> m_userInfoCache =
+                new Dictionary<UUID, UserInfoCacheEntry>();
 
         public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
         {
@@ -1934,13 +1944,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
             {
-                if (llVecDist(new LSL_Vector(0,0,0), targetPos) <= 10.0f)
-                {
-                    part.OffsetPosition = new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z);
-                    SceneObjectGroup parent = part.ParentGroup;
-                    parent.HasGroupChanged = true;
-                    parent.ScheduleGroupForTerseUpdate();
-                }
+                LSL_Vector rel_vec = SetPosAdjust(currentPos, targetPos);
+                part.OffsetPosition = new Vector3((float)rel_vec.x, (float)rel_vec.y, (float)rel_vec.z);
+                SceneObjectGroup parent = part.ParentGroup;
+                parent.HasGroupChanged = true;
+                parent.ScheduleGroupForTerseUpdate();
             }
         }
 
@@ -3250,17 +3258,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llPointAt(LSL_Vector pos)
         {
             m_host.AddScriptLPS(1);
-            ScenePresence Owner = World.GetScenePresence(m_host.UUID);
-            LSL_Rotation rot = llEuler2Rot(pos);
-            Owner.PreviousRotation = Owner.Rotation;
-            Owner.Rotation = (new Quaternion((float)rot.x,(float)rot.y,(float)rot.z,(float)rot.s));
         }
 
         public void llStopPointAt()
         {
             m_host.AddScriptLPS(1);
-            ScenePresence Owner = m_host.ParentGroup.Scene.GetScenePresence(m_host.OwnerID);
-            Owner.Rotation = Owner.PreviousRotation;
         }
 
         public void llTargetOmega(LSL_Vector axis, double spinrate, double gain)
@@ -3916,24 +3918,56 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.AddScriptLPS(1);
 
             UUID uuid = (UUID)id;
+            PresenceInfo pinfo = null;
+            UserAccount account;
 
-            UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
+            UserInfoCacheEntry ce;
+            if (!m_userInfoCache.TryGetValue(uuid, out ce))
+            {
+                account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
+                if (account == null)
+                {
+                    m_userInfoCache[uuid] = null; // Cache negative
+                    return UUID.Zero.ToString();
+                }
 
-            PresenceInfo pinfo = null;
-            PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
-            if (pinfos != null && pinfos.Length > 0)
-                pinfo = pinfos[0];
 
-            if (pinfo == null)
-                return UUID.Zero.ToString();
+                PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
+                if (pinfos != null && pinfos.Length > 0)
+                    pinfo = pinfos[0];
+
+                ce = new UserInfoCacheEntry();
+                ce.time = Util.EnvironmentTickCount();
+                ce.account = account;
+                ce.pinfo = pinfo;
+            }
+            else
+            {
+                if (ce == null)
+                    return UUID.Zero.ToString();
+
+                account = ce.account;
+                pinfo = ce.pinfo;
+            }
+
+            if (Util.EnvironmentTickCount() < ce.time || (Util.EnvironmentTickCount() - ce.time) >= 20000)
+            {
+                PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
+                if (pinfos != null && pinfos.Length > 0)
+                    pinfo = pinfos[0];
+                else
+                    pinfo = null;
+
+                ce.time = Util.EnvironmentTickCount();
+                ce.pinfo = pinfo;
+            }
 
             string reply = String.Empty;
 
             switch (data)
             {
             case 1: // DATA_ONLINE (0|1)
-                // TODO: implement fetching of this information
-                if (pinfo != null)
+                if (pinfo != null && pinfo.RegionID != UUID.Zero)
                     reply = "1";
                 else 
                     reply = "0";
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
index fe71ed5..5ae6439 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LS_Api.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 06f9426..5da6bb9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -273,9 +273,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int CHANGED_LINK = 32;
         public const int CHANGED_ALLOWED_DROP = 64;
         public const int CHANGED_OWNER = 128;
-        public const int CHANGED_REGION_RESTART = 256;
-        public const int CHANGED_REGION = 512;
-        public const int CHANGED_TELEPORT = 1024;
+        public const int CHANGED_REGION = 256;
+        public const int CHANGED_TELEPORT = 512;
+        public const int CHANGED_REGION_RESTART = 1024;
+        public const int CHANGED_REGION_START = 1024; //LL Changed the constant from CHANGED_REGION_RESTART
         public const int CHANGED_MEDIA = 2048;
         public const int CHANGED_ANIMATION = 16384;
         public const int TYPE_INVALID = 0;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 3dd381d..6663aa5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -388,17 +388,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     PostEvent(new EventParams("attach",
                         new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0]));
                 }
-                else if (m_stateSource == StateSource.NewRez)
+                else if (m_stateSource == StateSource.RegionStart)
                 {
 //                    m_log.Debug("[Script] Posted changed(CHANGED_REGION_RESTART) to script");
                     PostEvent(new EventParams("changed",
-                                              new Object[] {new LSL_Types.LSLInteger(256)}, new DetectParams[0]));
+                                              new Object[] { (int)Changed.REGION_RESTART }, new DetectParams[0]));
                 }
                 else if (m_stateSource == StateSource.PrimCrossing)
                 {
                     // CHANGED_REGION
                     PostEvent(new EventParams("changed",
-                                              new Object[] {new LSL_Types.LSLInteger(512)}, new DetectParams[0]));
+                                              new Object[] { (int)Changed.REGION }, new DetectParams[0]));
                 }
             } 
             else 
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 42eca05..96d2605 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -358,7 +358,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
         private bool GetBoolResponse(XmlRpcRequest request, out string reason)
         {
-            //m_log.Debug("[HGrid]: Linking to " + uri);
+            //m_log.Debug("[USER AGENT CONNECTOR]: GetBoolResponse from/to " + m_ServerURL);
             XmlRpcResponse response = null;
             try
             {
@@ -366,14 +366,14 @@ namespace OpenSim.Services.Connectors.Hypergrid
             }
             catch (Exception e)
             {
-                m_log.Debug("[USER AGENT CONNECTOR]: Unable to contact remote server ");
+                m_log.DebugFormat("[USER AGENT CONNECTOR]: Unable to contact remote server {0}", m_ServerURL);
                 reason = "Exception: " + e.Message;
                 return false;
             }
 
             if (response.IsFault)
             {
-                m_log.ErrorFormat("[HGrid]: remote call returned an error: {0}", response.FaultString);
+                m_log.ErrorFormat("[HGrid]: remote call to {0} returned an error: {1}", m_ServerURL, response.FaultString);
                 reason = "XMLRPC Fault";
                 return false;
             }
@@ -383,15 +383,29 @@ namespace OpenSim.Services.Connectors.Hypergrid
             //    m_log.Debug(">> " + ((DictionaryEntry)o).Key + ":" + ((DictionaryEntry)o).Value);
             try
             {
+                if (hash == null)
+                {
+                    m_log.ErrorFormat("[USER AGENT CONNECTOR]: Got null response from {0}! THIS IS BAAAAD", m_ServerURL);
+                    reason = "Internal error 1";
+                    return false;
+                }
                 bool success = false;
                 reason = string.Empty;
-                Boolean.TryParse((string)hash["result"], out success);
+                if (hash.ContainsKey("result"))
+                    Boolean.TryParse((string)hash["result"], out success);
+                else
+                {
+                    reason = "Internal error 2";
+                    m_log.WarnFormat("[USER AGENT CONNECTOR]: response from {0} does not have expected key 'result'", m_ServerURL);
+                }
 
                 return success;
             }
             catch (Exception e)
             {
-                m_log.Error("[HGrid]: Got exception while parsing GetEndPoint response " + e.StackTrace);
+                m_log.ErrorFormat("[HGrid]: Got exception on GetBoolResponse response.");
+                if (hash.ContainsKey("result") && hash["result"] != null)
+                    m_log.ErrorFormat("Reply was ", (string)hash["result"]);
                 reason = "Exception: " + e.Message;
                 return false;
             }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index dc68259..2b6d29c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -745,6 +745,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 }
             }
 
+            m_log.Debug("[SIMIAN INVENTORY CONNECTOR]: Parsed " + invFolders.Count + " folders from SimianGrid response");
             return invFolders;
         }
 
@@ -810,6 +811,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 }
             }
 
+            m_log.Debug("[SIMIAN INVENTORY CONNECTOR]: Parsed " + invItems.Count + " items from SimianGrid response");
             return invItems;
         }
 
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 46d72dc..ebaed42 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Services.GridService
         private bool m_DeleteOnUnregister = true;
         private static GridService m_RootInstance = null;
         protected IConfigSource m_config;
-        protected HypergridLinker m_HypergridLinker;
+        protected static HypergridLinker m_HypergridLinker;
 
         protected IAuthenticationService m_AuthenticationService = null;
         protected bool m_AllowDuplicateNames = false;
@@ -124,7 +124,7 @@ namespace OpenSim.Services.GridService
                 {
                     // Regions reserved for the null key cannot be taken.
                     if ((string)region.Data["PrincipalID"] == UUID.Zero.ToString())
-                        return "Region location us reserved";
+                        return "Region location is reserved";
 
                     // Treat it as an auth request
                     //
@@ -210,6 +210,7 @@ namespace OpenSim.Services.GridService
                 {
                     int newFlags = 0;
                     string regionName = rdata.RegionName.Trim().Replace(' ', '_');
+                    newFlags = ParseFlags(newFlags, gridConfig.GetString("DefaultRegionFlags", String.Empty));
                     newFlags = ParseFlags(newFlags, gridConfig.GetString("Region_" + regionName, String.Empty));
                     newFlags = ParseFlags(newFlags, gridConfig.GetString("Region_" + rdata.RegionID.ToString(), String.Empty));
                     rdata.Data["flags"] = newFlags.ToString();
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index ae80a8c..1f53007 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -378,32 +378,31 @@ namespace OpenSim.Services.GridService
 
         public void HandleShow(string module, string[] cmd)
         {
-            MainConsole.Instance.Output("Not Implemented Yet");
-            //if (cmd.Length != 2)
-            //{
-            //    MainConsole.Instance.Output("Syntax: show hyperlinks");
-            //    return;
-            //}
-            //List<GridRegion> regions = new List<GridRegion>(m_HypergridService.m_HyperlinkRegions.Values);
-            //if (regions == null || regions.Count < 1)
-            //{
-            //    MainConsole.Instance.Output("No hyperlinks");
-            //    return;
-            //}
+            if (cmd.Length != 2)
+            {
+                MainConsole.Instance.Output("Syntax: show hyperlinks");
+                return;
+            }
+            List<RegionData> regions = m_Database.GetHyperlinks(UUID.Zero);
+            if (regions == null || regions.Count < 1)
+            {
+                MainConsole.Instance.Output("No hyperlinks");
+                return;
+            }
 
-            //MainConsole.Instance.Output("Region Name          Region UUID");
-            //MainConsole.Instance.Output("Location             URI");
-            //MainConsole.Instance.Output("Owner ID  ");
-            //MainConsole.Instance.Output("-------------------------------------------------------------------------------");
-            //foreach (GridRegion r in regions)
-            //{
-            //    MainConsole.Instance.Output(String.Format("{0,-20} {1}\n{2,-20} {3}\n{4,-39} \n\n",
-            //            r.RegionName, r.RegionID,
-            //            String.Format("{0},{1}", r.RegionLocX, r.RegionLocY), "http://" + r.ExternalHostName + ":" + r.HttpPort.ToString(),
-            //            r.EstateOwner.ToString()));
-            //}
-            //return;
+            MainConsole.Instance.Output("Region Name                             Region UUID");
+            MainConsole.Instance.Output("Location                                URI");
+            MainConsole.Instance.Output("-------------------------------------------------------------------------------");
+            foreach (RegionData r in regions)
+            {
+                MainConsole.Instance.Output(String.Format("{0,-39} {1}\n{2,-39} {3}\n",
+                        r.RegionName, r.RegionID,
+                        String.Format("{0},{1} ({2},{3})", r.posX, r.posY, r.posX / 256, r.posY / 256),
+                        "http://" + r.Data["serverIP"].ToString() + ":" + r.Data["serverHttpPort"].ToString()));
+            }
+            return;
         }
+
         public void RunCommand(string module, string[] cmdparams)
         {
             List<string> args = new List<string>(cmdparams);
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index c5cfe75..3aaafe8 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -49,61 +49,64 @@ namespace OpenSim.Services.HypergridService
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        IGridService m_GridService;
-        IPresenceService m_PresenceService;
-        IUserAccountService m_UserAccountService;
-        IUserAgentService m_UserAgentService;
-        ISimulationService m_SimulationService;
+        private static bool m_Initialized = false;
 
-        string m_AuthDll;
+        private static IGridService m_GridService;
+        private static IPresenceService m_PresenceService;
+        private static IUserAccountService m_UserAccountService;
+        private static IUserAgentService m_UserAgentService;
+        private static ISimulationService m_SimulationService;
 
-        UUID m_ScopeID;
-        bool m_AllowTeleportsToAnyRegion;
-        string m_ExternalName;
-        GridRegion m_DefaultGatewayRegion;
+        private static UUID m_ScopeID;
+        private static bool m_AllowTeleportsToAnyRegion;
+        private static string m_ExternalName;
+        private static GridRegion m_DefaultGatewayRegion;
 
         public GatekeeperService(IConfigSource config, ISimulationService simService)
         {
-            IConfig serverConfig = config.Configs["GatekeeperService"];
-            if (serverConfig == null)
-                throw new Exception(String.Format("No section GatekeeperService in config file"));
-
-            string accountService = serverConfig.GetString("UserAccountService", String.Empty);
-            string homeUsersService = serverConfig.GetString("HomeUsersSecurityService", string.Empty);
-            string gridService = serverConfig.GetString("GridService", String.Empty);
-            string presenceService = serverConfig.GetString("PresenceService", String.Empty);
-            string simulationService = serverConfig.GetString("SimulationService", String.Empty);
-
-            //m_AuthDll = serverConfig.GetString("AuthenticationService", String.Empty);
-
-            // These 3 are mandatory, the others aren't
-            if (gridService == string.Empty || presenceService == string.Empty || m_AuthDll == string.Empty)
-                throw new Exception("Incomplete specifications, Gatekeeper Service cannot function.");
-            
-            string scope = serverConfig.GetString("ScopeID", UUID.Zero.ToString());
-            UUID.TryParse(scope, out m_ScopeID);
-            //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
-            m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true);
-            m_ExternalName = serverConfig.GetString("ExternalName", string.Empty);
-
-            Object[] args = new Object[] { config };
-            m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
-            m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
-
-            if (accountService != string.Empty)
-                m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
-            if (homeUsersService != string.Empty)
-                m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(homeUsersService, args);
-
-            if (simService != null)
-                m_SimulationService = simService;
-            else if (simulationService != string.Empty)
-                    m_SimulationService = ServerUtils.LoadPlugin<ISimulationService>(simulationService, args);
-
-            if (m_GridService == null || m_PresenceService == null || m_SimulationService == null)
-                throw new Exception("Unable to load a required plugin, Gatekeeper Service cannot function.");
-
-            m_log.Debug("[GATEKEEPER SERVICE]: Starting...");
+            if (!m_Initialized)
+            {
+                m_Initialized = true;
+
+                IConfig serverConfig = config.Configs["GatekeeperService"];
+                if (serverConfig == null)
+                    throw new Exception(String.Format("No section GatekeeperService in config file"));
+
+                string accountService = serverConfig.GetString("UserAccountService", String.Empty);
+                string homeUsersService = serverConfig.GetString("UserAgentService", string.Empty);
+                string gridService = serverConfig.GetString("GridService", String.Empty);
+                string presenceService = serverConfig.GetString("PresenceService", String.Empty);
+                string simulationService = serverConfig.GetString("SimulationService", String.Empty);
+
+                // These 3 are mandatory, the others aren't
+                if (gridService == string.Empty || presenceService == string.Empty)
+                    throw new Exception("Incomplete specifications, Gatekeeper Service cannot function.");
+                
+                string scope = serverConfig.GetString("ScopeID", UUID.Zero.ToString());
+                UUID.TryParse(scope, out m_ScopeID);
+                //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!");
+                m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true);
+                m_ExternalName = serverConfig.GetString("ExternalName", string.Empty);
+
+                Object[] args = new Object[] { config };
+                m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
+                m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(presenceService, args);
+
+                if (accountService != string.Empty)
+                    m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
+                if (homeUsersService != string.Empty)
+                    m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(homeUsersService, args);
+
+                if (simService != null)
+                    m_SimulationService = simService;
+                else if (simulationService != string.Empty)
+                        m_SimulationService = ServerUtils.LoadPlugin<ISimulationService>(simulationService, args);
+
+                if (m_GridService == null || m_PresenceService == null || m_SimulationService == null)
+                    throw new Exception("Unable to load a required plugin, Gatekeeper Service cannot function.");
+
+                m_log.Debug("[GATEKEEPER SERVICE]: Starting...");
+            }
         }
 
         public GatekeeperService(IConfigSource config)
@@ -280,18 +283,23 @@ namespace OpenSim.Services.HypergridService
                 return false;
             }
 
-            Object[] args = new Object[] { userURL };
-            IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); //ServerUtils.LoadPlugin<IUserAgentService>(m_AuthDll, args);
-            if (userAgentService != null)
+            if (userURL == m_ExternalName)
+                return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
+            else
             {
-                try
+                Object[] args = new Object[] { userURL };
+                IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); 
+                if (userAgentService != null)
                 {
-                    return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
-                }
-                catch
-                {
-                    m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
-                    return false;
+                    try
+                    {
+                        return userAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
+                    }
+                    catch
+                    {
+                        m_log.DebugFormat("[GATEKEEPER SERVICE]: Unable to contact authentication service at {0}", userURL);
+                        return false;
+                    }
                 }
             }
 
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index 2f1fed4..181d7f2 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -62,11 +62,18 @@ namespace OpenSim.Services.HypergridService
         protected static IGridUserService m_GridUserService;
         protected static IGridService m_GridService;
         protected static GatekeeperServiceConnector m_GatekeeperConnector;
+        protected static IGatekeeperService m_GatekeeperService;
+
+        protected static string m_GridName;
+
+        protected static bool m_BypassClientVerification;
 
         public UserAgentService(IConfigSource config)
         {
             if (!m_Initialized)
             {
+                m_Initialized = true;
+
                 m_log.DebugFormat("[HOME USERS SECURITY]: Starting...");
                 
                 IConfig serverConfig = config.Configs["UserAgentService"];
@@ -75,16 +82,25 @@ namespace OpenSim.Services.HypergridService
 
                 string gridService = serverConfig.GetString("GridService", String.Empty);
                 string gridUserService = serverConfig.GetString("GridUserService", String.Empty);
+                string gatekeeperService = serverConfig.GetString("GatekeeperService", String.Empty);
+
+                m_BypassClientVerification = serverConfig.GetBoolean("BypassClientVerification", false);
 
-                if (gridService == string.Empty || gridUserService == string.Empty)
+                if (gridService == string.Empty || gridUserService == string.Empty || gatekeeperService == string.Empty)
                     throw new Exception(String.Format("Incomplete specifications, UserAgent Service cannot function."));
 
                 Object[] args = new Object[] { config };
                 m_GridService = ServerUtils.LoadPlugin<IGridService>(gridService, args);
                 m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args);
                 m_GatekeeperConnector = new GatekeeperServiceConnector();
+                m_GatekeeperService = ServerUtils.LoadPlugin<IGatekeeperService>(gatekeeperService, args);
 
-                m_Initialized = true;
+                m_GridName = serverConfig.GetString("ExternalName", string.Empty);
+                if (m_GridName == string.Empty)
+                {
+                    serverConfig = config.Configs["GatekeeperService"];
+                    m_GridName = serverConfig.GetString("ExternalName", string.Empty);
+                }
             }
         }
 
@@ -131,7 +147,13 @@ namespace OpenSim.Services.HypergridService
             agentCircuit.ServiceSessionID = "http://" + region.ExternalHostName + ":" + region.HttpPort + ";" + UUID.Random();
             TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region);
 
-            bool success = m_GatekeeperConnector.CreateAgent(region, agentCircuit, (uint)Constants.TeleportFlags.ViaLogin, out reason);
+            //bool success = m_GatekeeperConnector.CreateAgent(region, agentCircuit, (uint)Constants.TeleportFlags.ViaLogin, out reason);
+            bool success = false;
+            string gridName = "http://" + gatekeeper.ExternalHostName + ":" + gatekeeper.HttpPort;
+            if (m_GridName == gridName)
+                success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason);
+            else
+                success = m_GatekeeperConnector.CreateAgent(region, agentCircuit, (uint)Constants.TeleportFlags.ViaLogin, out reason);
 
             if (!success)
             {
@@ -171,7 +193,7 @@ namespace OpenSim.Services.HypergridService
                 m_TravelingAgents[agentCircuit.SessionID] = travel;
             }
             travel.UserID = agentCircuit.AgentID;
-            travel.GridExternalName = region.ExternalHostName + ":" + region.HttpPort;
+            travel.GridExternalName = "http://" + region.ExternalHostName + ":" + region.HttpPort;
             travel.ServiceToken = agentCircuit.ServiceSessionID;
             if (old != null)
                 travel.ClientToken = old.ClientToken;
@@ -207,16 +229,16 @@ namespace OpenSim.Services.HypergridService
                 return false;
 
             TravelingAgentInfo travel = m_TravelingAgents[sessionID];
+
             return travel.GridExternalName == thisGridExternalName;
         }
 
         public bool VerifyClient(UUID sessionID, string token)
         {
-            m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with token {1}", sessionID, token);
-            //return true;
+            if (m_BypassClientVerification)
+                return true;
 
-            // Commenting this for now until I understand better what part of a sender's
-            // info stays unchanged throughout a session
+            m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with token {1}", sessionID, token);
 
             if (m_TravelingAgents.ContainsKey(sessionID))
                 return m_TravelingAgents[sessionID].ClientToken == token;
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index bb24292..f63ab16 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -45,6 +45,7 @@ namespace OpenSim.Services.InventoryService
                 MethodBase.GetCurrentMethod().DeclaringType);
 
         protected IXInventoryData m_Database;
+        protected bool m_AllowDelete = true;
 
         public XInventoryService(IConfigSource config) : base(config)
         {
@@ -60,6 +61,7 @@ namespace OpenSim.Services.InventoryService
             {
                 dllName = authConfig.GetString("StorageProvider", dllName);
                 connString = authConfig.GetString("ConnectionString", connString);
+                m_AllowDelete = authConfig.GetBoolean("AllowDelete", true);
                 // realm = authConfig.GetString("Realm", realm);
             }
 
@@ -304,10 +306,15 @@ namespace OpenSim.Services.InventoryService
         //
         public virtual bool DeleteFolders(UUID principalID, List<UUID> folderIDs)
         {
+            if (!m_AllowDelete)
+                return false;
+
             // Ignore principal ID, it's bogus at connector level
             //
             foreach (UUID id in folderIDs)
             {
+                if (!ParentIsTrash(id))
+                    continue;
                 InventoryFolderBase f = new InventoryFolderBase();
                 f.ID = id;
                 PurgeFolder(f);
@@ -319,6 +326,12 @@ namespace OpenSim.Services.InventoryService
 
         public virtual bool PurgeFolder(InventoryFolderBase folder)
         {
+            if (!m_AllowDelete)
+                return false;
+
+            if (!ParentIsTrash(folder.ID))
+                return false;
+
             XInventoryFolder[] subFolders = m_Database.GetFolders(
                     new string[] { "parentFolderID" },
                     new string[] { folder.ID.ToString() });
@@ -358,6 +371,9 @@ namespace OpenSim.Services.InventoryService
 
         public virtual bool DeleteItems(UUID principalID, List<UUID> itemIDs)
         {
+            if (!m_AllowDelete)
+                return false;
+
             // Just use the ID... *facepalms*
             //
             foreach (UUID id in itemIDs)
@@ -519,5 +535,32 @@ namespace OpenSim.Services.InventoryService
 
             return newItem;
         }
+
+        private bool ParentIsTrash(UUID folderID)
+        {
+            XInventoryFolder[] folder = m_Database.GetFolders(new string[] {"folderID"}, new string[] {folderID.ToString()});
+            if (folder.Length < 1)
+                return false;
+
+            if (folder[0].type == (int)AssetType.TrashFolder)
+                return true;
+
+            UUID parentFolder = folder[0].parentFolderID;
+
+            while (parentFolder != UUID.Zero)
+            {
+                XInventoryFolder[] parent = m_Database.GetFolders(new string[] {"folderID"}, new string[] {parentFolder.ToString()});
+                if (parent.Length < 1)
+                    return false;
+
+                if (parent[0].type == (int)AssetType.TrashFolder)
+                    return true;
+                if (parent[0].type == (int)AssetType.RootFolder)
+                    return false;
+
+                parentFolder = parent[0].parentFolderID;
+            }
+            return false;
+        }
     }
 }
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index f4e045c..036bec6 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -754,10 +754,8 @@ namespace OpenSim.Services.LLLoginService
             m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName);
             if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, out reason))
             {
-                // We may need to do this at some point,
-                // so leaving it here in comments.
-                //IPAddress addr = NetworkUtil.GetIPFor(clientIP.Address, destination.ExternalEndPoint.Address);
-                m_UserAgentService.SetClientToken(aCircuit.SessionID, /*addr.Address.ToString() */ clientIP.Address.ToString());
+                IPAddress addr = NetworkUtil.GetExternalIPOf(clientIP.Address);
+                m_UserAgentService.SetClientToken(aCircuit.SessionID, addr.ToString() /* clientIP.Address.ToString() */);
                 return true;
             }
             return false;
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index 1619a22..e74debb 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -241,36 +241,6 @@ namespace OpenSim.Tools.Configger
                 config.Set("EventQueue", true);
             }
 
-            {
-                IConfig config = defaultConfig.Configs["StandAlone"];
-
-                if (null == config)
-                    config = defaultConfig.AddConfig("StandAlone");
-
-                config.Set("accounts_authenticate", true);
-                config.Set("welcome_message", "Welcome to OpenSimulator");
-                config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll");
-                config.Set("inventory_source", "");
-                config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
-                config.Set("user_source", "");
-                config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar));
-            }
-
-            {
-                IConfig config = defaultConfig.Configs["Network"];
-
-                if (null == config)
-                    config = defaultConfig.AddConfig("Network");
-
-                config.Set("default_location_x", 1000);
-                config.Set("default_location_y", 1000);
-                config.Set("grid_send_key", "null");
-                config.Set("grid_recv_key", "null");
-                config.Set("user_send_key", "null");
-                config.Set("user_recv_key", "null");
-                config.Set("secure_inventory_server", "true");
-            }
-
             return defaultConfig;
         }
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 0cf9ab1..9269e39 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -207,6 +207,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ;; for the service
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
+    GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
 
 ;; The interface that local users get when they are in other grids.
 ;; This restricts the inventory operations while in other grids.
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index e87270d..35e7da2 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -114,6 +114,8 @@
         ;; for the service
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
+    GatekeeperService = "OpenSim.Services.HypergridService.dll:GatekeeperService"
+
         
 ;; The interface that local users get when they are in other grids
 ;; This greatly restricts the inventory operations while in other grids
diff --git a/prebuild.xml b/prebuild.xml
index 1eabc4b..94c83f7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1418,35 +1418,11 @@
         <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
         <Match pattern="*.cs" recurse="true">
           <Exclude name="Tests" pattern="Tests" />
-          <Exclude name="TerrainDefaultEffects" pattern="World/Terrain/DefaultEffects" />
         </Match>
         <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules.World.Terrain.DefaultEffects" path="OpenSim/Region/CoreModules/World/Terrain/DefaultEffects" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../../../../bin/Terrain/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../../../../bin/Terrain/</OutputPath>
-        </Options>
-      </Configuration>
-
-      <ReferencePath>../../../../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Region.Framework"/>
-      <Reference name="OpenSim.Region.CoreModules"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-
-
     <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
       <Configuration name="Debug">
         <Options>