Merge branch 'master' into test-merge0418

1 files changed, 163 insertions, 89 deletions

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 1b4d1ea..5a011ce 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -94,7 +94,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         public void Initialise()
         {
-            m_log.Info("[RADMIN]: " + Name + " cannot be default-initialized!");
+            m_log.Error("[RADMIN]: " + Name + " cannot be default-initialized!");
             throw new PluginNotInitialisedException(Name);
         }
 
@@ -111,7 +111,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 else
                 {
                     m_config = m_configSource.Configs["RemoteAdmin"];
-                    m_log.Info("[RADMIN]: Remote Admin Plugin Enabled");
+                    m_log.Debug("[RADMIN]: Remote Admin Plugin Enabled");
                     m_requiredPassword = m_config.GetString("access_password", String.Empty);
                     int port = m_config.GetInt("port", 0);
 
@@ -130,6 +130,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     availableMethods["admin_broadcast"] = XmlRpcAlertMethod;
                     availableMethods["admin_restart"] = XmlRpcRestartMethod;
                     availableMethods["admin_load_heightmap"] = XmlRpcLoadHeightmapMethod;
+                    availableMethods["admin_save_heightmap"] = XmlRpcSaveHeightmapMethod;
                     // User management
                     availableMethods["admin_create_user"] = XmlRpcCreateUserMethod;
                     availableMethods["admin_create_user_email"] = XmlRpcCreateUserMethod;
@@ -230,8 +231,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[RADMIN]: Restart region: failed: {0}", e.Message);
-                m_log.DebugFormat("[RADMIN]: Restart region: failed: {0}", e.ToString());
+                m_log.ErrorFormat("[RADMIN]: Restart region: failed: {0} {1}", e.Message, e.StackTrace);
                 responseData["accepted"] = false;
                 responseData["success"] = false;
                 responseData["rebooting"] = false;
@@ -277,8 +277,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[RADMIN]: Broadcasting: failed: {0}", e.Message);
-                m_log.DebugFormat("[RADMIN]: Broadcasting: failed: {0}", e.ToString());
+                m_log.ErrorFormat("[RADMIN]: Broadcasting: failed: {0}", e.Message, e.StackTrace);
 
                 responseData["accepted"] = false;
                 responseData["success"] = false;
@@ -301,7 +300,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             {
                 Hashtable requestData = (Hashtable) request.Params[0];
 
-                m_log.DebugFormat("[RADMIN]: Load Terrain: XmlRpc {0}", request.ToString());
+                m_log.DebugFormat("[RADMIN]: Load Terrain: XmlRpc {0}", request);
                 // foreach (string k in requestData.Keys)
                 // {
                 //     m_log.DebugFormat("[RADMIN]: Load Terrain: XmlRpc {0}: >{1}< {2}",
@@ -348,8 +347,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[RADMIN]: Terrain Loading: failed: {0}", e.Message);
-                m_log.DebugFormat("[RADMIN]: Terrain Loading: failed: {0}", e.ToString());
+                m_log.ErrorFormat("[RADMIN]: Terrain Loading: failed: {0} {1}", e.Message, e.StackTrace);
 
                 responseData["success"] = false;
                 responseData["error"] = e.Message;
@@ -360,6 +358,61 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             return response;
         }
 
+        public XmlRpcResponse XmlRpcSaveHeightmapMethod(XmlRpcRequest request, IPEndPoint remoteClient)
+
+        {
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable responseData = new Hashtable();
+
+            m_log.Info("[RADMIN]: Save height maps request started");
+
+            try
+            {
+                Hashtable requestData = (Hashtable)request.Params[0];
+
+                m_log.DebugFormat("[RADMIN]: Save Terrain: XmlRpc {0}", request.ToString());
+
+                CheckStringParameters(request, new string[] { "password", "filename", "regionid" });
+
+                if (m_requiredPassword != String.Empty &&
+                    (!requestData.Contains("password") || (string)requestData["password"] != m_requiredPassword))
+                    throw new Exception("wrong password");
+
+                string file = (string)requestData["filename"];
+                UUID regionID = (UUID)(string)requestData["regionid"];
+                m_log.InfoFormat("[RADMIN]: Terrain Saving: {0}", file);
+
+                responseData["accepted"] = true;
+
+                Scene region = null;
+
+                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>();
+                if (null == terrainModule) throw new Exception("terrain module not available");
+
+                terrainModule.SaveToFile(file);
+
+                responseData["success"] = false;
+
+                response.Value = responseData;
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[RADMIN]: Terrain Saving: failed: {0}", e.Message);
+                m_log.DebugFormat("[RADMIN]: Terrain Saving: failed: {0}", e.ToString());
+
+                responseData["success"] = false;
+                responseData["error"] = e.Message;
+
+            }
+
+            m_log.Info("[RADMIN]: Save height maps request complete");
+
+            return response;
+        }
+
         public XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request, IPEndPoint remoteClient)
         {
             m_log.Info("[RADMIN]: Received Shutdown Administrator Request");
@@ -417,14 +470,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[RADMIN] Shutdown: failed: {0}", e.Message);
-                m_log.DebugFormat("[RADMIN] Shutdown: failed: {0}", e.ToString());
+                m_log.ErrorFormat("[RADMIN]: Shutdown: failed: {0} {1}", e.Message, e.StackTrace);
 
                 responseData["accepted"] = false;
                 responseData["error"] = e.Message;
 
                 response.Value = responseData;
             }
+            
             m_log.Info("[RADMIN]: Shutdown Administrator Request complete");
             return response;
         }
@@ -725,8 +778,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
                 catch (Exception e)
                 {
-                    m_log.ErrorFormat("[RADMIN] CreateRegion: failed {0}", e.Message);
-                    m_log.DebugFormat("[RADMIN] CreateRegion: failed {0}", e.ToString());
+                    m_log.ErrorFormat("[RADMIN] CreateRegion: failed {0} {1}", e.Message, e.StackTrace);
 
                     responseData["success"] = false;
                     responseData["error"] = e.Message;
@@ -792,8 +844,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
                 catch (Exception e)
                 {
-                    m_log.ErrorFormat("[RADMIN] DeleteRegion: failed {0}", e.Message);
-                    m_log.DebugFormat("[RADMIN] DeleteRegion: failed {0}", e.ToString());
+                    m_log.ErrorFormat("[RADMIN] DeleteRegion: failed {0} {1}", e.Message, e.StackTrace);
 
                     responseData["success"] = false;
                     responseData["error"] = e.Message;
@@ -884,8 +935,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
                 catch (Exception e)
                 {
-                    m_log.ErrorFormat("[RADMIN] CloseRegion: failed {0}", e.Message);
-                    m_log.DebugFormat("[RADMIN] CloseRegion: failed {0}", e.ToString());
+                    m_log.ErrorFormat("[RADMIN]: CloseRegion: failed {0} {1}", e.Message, e.StackTrace);
 
                     responseData["success"] = false;
                     responseData["error"] = e.Message;
@@ -982,8 +1032,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
                 catch (Exception e)
                 {
-                    m_log.ErrorFormat("[RADMIN] ModifyRegion: failed {0}", e.Message);
-                    m_log.DebugFormat("[RADMIN] ModifyRegion: failed {0}", e.ToString());
+                    m_log.ErrorFormat("[RADMIN] ModifyRegion: failed {0} {1}", e.Message, e.StackTrace);
 
                     responseData["success"] = false;
                     responseData["error"] = e.Message;
@@ -1106,8 +1155,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
                 catch (Exception e)
                 {
-                    m_log.ErrorFormat("[RADMIN] CreateUser: failed: {0}", e.Message);
-                    m_log.DebugFormat("[RADMIN] CreateUser: failed: {0}", e.ToString());
+                    m_log.ErrorFormat("[RADMIN]: CreateUser: failed: {0} {1}", e.Message, e.StackTrace);
 
                     responseData["success"] = false;
                     responseData["avatar_uuid"] = UUID.Zero.ToString();
@@ -1198,8 +1246,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[RADMIN] UserExists: failed: {0}", e.Message);
-                m_log.DebugFormat("[RADMIN] UserExists: failed: {0}", e.ToString());
+                m_log.ErrorFormat("[RADMIN]: UserExists: failed: {0} {1}", e.Message, e.StackTrace);
 
                 responseData["success"] = false;
                 responseData["error"] = e.Message;
@@ -1372,9 +1419,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
                 catch (Exception e)
                 {
-
-                    m_log.ErrorFormat("[RADMIN] UpdateUserAccount: failed: {0}", e.Message);
-                    m_log.DebugFormat("[RADMIN] UpdateUserAccount: failed: {0}", e.ToString());
+                    m_log.ErrorFormat("[RADMIN] UpdateUserAccount: failed: {0} {1}", e.Message, e.StackTrace);
 
                     responseData["success"] = false;
                     responseData["avatar_uuid"] = UUID.Zero.ToString();
@@ -1382,6 +1427,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     response.Value = responseData;
                 }
+                
                 m_log.Info("[RADMIN]: UpdateUserAccount: request complete");
                 return response;
             }
@@ -1397,7 +1443,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         private void UpdateUserAppearance(Hashtable responseData, Hashtable requestData, UUID userid)
         {
-            m_log.DebugFormat("[RADMIN] updateUserAppearance");
+            m_log.DebugFormat("[RADMIN]: updateUserAppearance");
 
             string defaultMale   = m_config.GetString("default_male", "Default Male");
             string defaultFemale = m_config.GetString("default_female", "Default Female");
@@ -1437,16 +1483,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             if (String.IsNullOrEmpty(model))
             {
-                m_log.DebugFormat("[RADMIN] Appearance update not requested");
+                m_log.DebugFormat("[RADMIN]: Appearance update not requested");
                 return;
             }
 
-            m_log.DebugFormat("[RADMIN] Setting appearance for avatar {0}, using model <{1}>", userid, model);
+            m_log.DebugFormat("[RADMIN]: Setting appearance for avatar {0}, using model <{1}>", userid, model);
 
             string[] modelSpecifiers = model.Split();
             if (modelSpecifiers.Length != 2)
             {
-                m_log.WarnFormat("[RADMIN] User appearance not set for {0}. Invalid model name : <{1}>", userid, model);
+                m_log.WarnFormat("[RADMIN]: User appearance not set for {0}. Invalid model name : <{1}>", userid, model);
                 // modelSpecifiers = dmodel.Split();
                 return;
             }
@@ -1457,7 +1503,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             if (modelProfile == null)
             {
-                m_log.WarnFormat("[RADMIN] Requested model ({0}) not found. Appearance unchanged", model);
+                m_log.WarnFormat("[RADMIN]: Requested model ({0}) not found. Appearance unchanged", model);
                 return;
             }
 
@@ -1467,7 +1513,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
             EstablishAppearance(userid, modelProfile.PrincipalID);
 
-            m_log.DebugFormat("[RADMIN] Finished setting appearance for avatar {0}, using model {1}",
+            m_log.DebugFormat("[RADMIN]: Finished setting appearance for avatar {0}, using model {1}",
                               userid, model);
         }
 
@@ -1479,7 +1525,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         private void EstablishAppearance(UUID destination, UUID source)
         {
-            m_log.DebugFormat("[RADMIN] Initializing inventory for {0} from {1}", destination, source);
+            m_log.DebugFormat("[RADMIN]: Initializing inventory for {0} from {1}", destination, source);
             Scene scene = m_application.SceneManager.CurrentOrFirstScene;
 
             // If the model has no associated appearance we're done.
@@ -1501,7 +1547,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
                 catch (Exception e)
                 {
-                    m_log.WarnFormat("[RADMIN] Error transferring appearance for {0} : {1}",
+                    m_log.WarnFormat("[RADMIN]: Error transferring appearance for {0} : {1}",
                                       destination, e.Message);
                 }
 
@@ -1532,7 +1578,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-               m_log.WarnFormat("[RADMIN] Error transferring appearance for {0} : {1}",
+               m_log.WarnFormat("[RADMIN]: Error transferring appearance for {0} : {1}",
                                   destination, e.Message);
             }
 
@@ -1567,7 +1613,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 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);
+                m_log.ErrorFormat("[RADMIN]: Created folder for destination {0}", source);
             }
 
             // Wearables
@@ -1587,6 +1633,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     {
                         InventoryItemBase destinationItem = new InventoryItemBase(UUID.Random(), destination);
                         destinationItem.Name = item.Name;
+                        destinationItem.Owner = destination;
                         destinationItem.Description = item.Description;
                         destinationItem.InvType = item.InvType;
                         destinationItem.CreatorId = item.CreatorId;
@@ -1606,6 +1653,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         destinationItem.Flags = item.Flags;
                         destinationItem.CreationDate = item.CreationDate;
                         destinationItem.Folder = destinationFolder.ID;
+                        ApplyNextOwnerPermissions(destinationItem);
 
                         m_application.SceneManager.CurrentOrFirstScene.AddInventoryItem(destinationItem);
                         m_log.DebugFormat("[RADMIN]: Added item {0} to folder {1}", destinationItem.ID, destinationFolder.ID);
@@ -1640,6 +1688,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     {
                         InventoryItemBase destinationItem = new InventoryItemBase(UUID.Random(), destination);
                         destinationItem.Name = item.Name;
+                        destinationItem.Owner = destination;
                         destinationItem.Description = item.Description;
                         destinationItem.InvType = item.InvType;
                         destinationItem.CreatorId = item.CreatorId;
@@ -1659,6 +1708,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         destinationItem.Flags = item.Flags;
                         destinationItem.CreationDate = item.CreationDate;
                         destinationItem.Folder = destinationFolder.ID;
+                        ApplyNextOwnerPermissions(destinationItem);
 
                         m_application.SceneManager.CurrentOrFirstScene.AddInventoryItem(destinationItem);
                         m_log.DebugFormat("[RADMIN]: Added item {0} to folder {1}", destinationItem.ID, destinationFolder.ID);
@@ -1716,13 +1766,17 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             {
                 destinationFolder = new InventoryFolderBase();
                 destinationFolder.ID       = UUID.Random();
-                destinationFolder.Name     = assetType.ToString();
+                if (assetType == AssetType.Clothing) {
+                    destinationFolder.Name  = "Clothing";
+                } else {
+                    destinationFolder.Name  = "Body Parts";
+                }
                 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);
+                m_log.ErrorFormat("[RADMIN]: Created folder for destination {0}", source);
             }
 
             InventoryFolderBase extraFolder;
@@ -1740,7 +1794,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 extraFolder.ParentID = destinationFolder.ID;
                 inventoryService.AddFolder(extraFolder);
 
-                m_log.DebugFormat("[RADMIN] Added folder {0} to folder {1}", extraFolder.ID, sourceFolder.ID);
+                m_log.DebugFormat("[RADMIN]: Added folder {0} to folder {1}", extraFolder.ID, sourceFolder.ID);
 
                 List<InventoryItemBase> items = inventoryService.GetFolderContent(source, folder.ID).Items;
 
@@ -1748,6 +1802,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 {
                     InventoryItemBase destinationItem = new InventoryItemBase(UUID.Random(), destination);
                     destinationItem.Name = item.Name;
+                    destinationItem.Owner = destination;
                     destinationItem.Description = item.Description;
                     destinationItem.InvType = item.InvType;
                     destinationItem.CreatorId = item.CreatorId;
@@ -1767,6 +1822,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     destinationItem.Flags = item.Flags;
                     destinationItem.CreationDate = item.CreationDate;
                     destinationItem.Folder = extraFolder.ID;
+                    ApplyNextOwnerPermissions(destinationItem);
 
                     m_application.SceneManager.CurrentOrFirstScene.AddInventoryItem(destinationItem);
                     inventoryMap.Add(item.ID, destinationItem.ID);
@@ -1784,6 +1840,29 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         }
 
         /// <summary>
+        /// Apply next owner permissions.
+        /// </summary>
+
+        private void ApplyNextOwnerPermissions(InventoryItemBase item)
+        {
+            if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0)
+            {
+                if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
+                    item.CurrentPermissions &= ~(uint)PermissionMask.Copy;
+                if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
+                    item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
+                if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
+                    item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
+            }
+            item.CurrentPermissions &= item.NextPermissions;
+            item.BasePermissions &= item.NextPermissions;
+            item.EveryOnePermissions &= item.NextPermissions;
+            // item.OwnerChanged = true;
+            // item.PermsMask = 0;
+            // item.PermsGranter = UUID.Zero;
+        }
+
+        /// <summary>
         /// This method is called if a given model avatar name can not be found. If the external
         /// file has already been loaded once, then control returns immediately. If not, then it
         /// looks for a default appearance file. This file contains XML definitions of zero or more named
@@ -1792,7 +1871,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
         /// indicate which outfit is the default, and this outfit will be automatically worn. The
         /// other outfits are provided to allow "real" avatars a way to easily change their outfits.
         /// </summary>
-
         private bool CreateDefaultAvatars()
         {
             // Only load once
@@ -1801,7 +1879,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 return false;
             }
 
-            m_log.DebugFormat("[RADMIN] Creating default avatar entries");
+            m_log.DebugFormat("[RADMIN]: Creating default avatar entries");
 
             m_defaultAvatarsLoaded = true;
 
@@ -1857,7 +1935,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                     foreach (XmlElement avatar in avatars)
                     {
-                        m_log.DebugFormat("[RADMIN] Loading appearance for {0}, gender = {1}",
+                        m_log.DebugFormat("[RADMIN]: Loading appearance for {0}, gender = {1}",
                             GetStringAttribute(avatar,"name","?"), GetStringAttribute(avatar,"gender","?"));
 
                         // Create the user identified by the avatar entry
@@ -1879,7 +1957,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                 account = CreateUser(scopeID, names[0], names[1], password, email);
                                 if (null == account)
                                 {
-                                    m_log.ErrorFormat("[RADMIN] Avatar {0} {1} was not created", names[0], names[1]);
+                                    m_log.ErrorFormat("[RADMIN]: Avatar {0} {1} was not created", names[0], names[1]);
                                     return false;
                                 }
                             }
@@ -1897,12 +1975,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                             ID = account.PrincipalID;
 
-                            m_log.DebugFormat("[RADMIN] User {0}[{1}] created or retrieved", name, ID);
+                            m_log.DebugFormat("[RADMIN]: User {0}[{1}] created or retrieved", name, ID);
                             include = true;
                         }
                         catch (Exception e)
                         {
-                            m_log.DebugFormat("[RADMIN] Error creating user {0} : {1}", name, e.Message);
+                            m_log.DebugFormat("[RADMIN]: Error creating user {0} : {1}", name, e.Message);
                             include = false;
                         }
 
@@ -1942,7 +2020,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                     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);
+                                    m_log.ErrorFormat("[RADMIN]: Created clothing folder for {0}/{1}", name, ID);
                                 }
 
                                 // OK, now we have an inventory for the user, read in the outfits from the
@@ -1955,7 +2033,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                                 foreach (XmlElement outfit in outfits)
                                 {
-                                    m_log.DebugFormat("[RADMIN] Loading outfit {0} for {1}",
+                                    m_log.DebugFormat("[RADMIN]: Loading outfit {0} for {1}",
                                         GetStringAttribute(outfit,"name","?"), GetStringAttribute(avatar,"name","?"));
 
                                     outfitName   = GetStringAttribute(outfit,"name","");
@@ -1979,7 +2057,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                     // Otherwise, we must create the folder.
                                     if (extraFolder == null)
                                     {
-                                        m_log.DebugFormat("[RADMIN] Creating outfit folder {0} for {1}", outfitName, name);
+                                        m_log.DebugFormat("[RADMIN]: Creating outfit folder {0} for {1}", outfitName, name);
                                         extraFolder          = new InventoryFolderBase();
                                         extraFolder.ID       = UUID.Random();
                                         extraFolder.Name     = outfitName;
@@ -1988,7 +2066,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                         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);
+                                        m_log.DebugFormat("[RADMIN]: Adding outfile folder {0} to folder {1}", extraFolder.ID, clothingFolder.ID);
                                     }
 
                                     // Now get the pieces that make up the outfit
@@ -2003,7 +2081,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                             switch (child.Name)
                                             {
                                                 case "Permissions" :
-                                                    m_log.DebugFormat("[RADMIN] Permissions specified");
+                                                    m_log.DebugFormat("[RADMIN]: Permissions specified");
                                                     perms = child;
                                                     break;
                                                 case "Asset" :
@@ -2053,7 +2131,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                             inventoryItem.Folder = extraFolder.ID; // Parent folder
 
                                             m_application.SceneManager.CurrentOrFirstScene.AddInventoryItem(inventoryItem);
-                                            m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", inventoryItem.ID, extraFolder.ID);
+                                            m_log.DebugFormat("[RADMIN]: Added item {0} to folder {1}", inventoryItem.ID, extraFolder.ID);
                                         }
 
                                         // Attach item, if attachpoint is specified
@@ -2061,7 +2139,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                         if (attachpoint != 0)
                                         {
                                             avatarAppearance.SetAttachment(attachpoint, inventoryItem.ID, inventoryItem.AssetID);
-                                            m_log.DebugFormat("[RADMIN] Attached {0}", inventoryItem.ID);
+                                            m_log.DebugFormat("[RADMIN]: Attached {0}", inventoryItem.ID);
                                         }
 
                                         // Record whether or not the item is to be initially worn
@@ -2074,32 +2152,32 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                                         }
                                         catch (Exception e)
                                         {
-                                            m_log.WarnFormat("[RADMIN] Error wearing item {0} : {1}", inventoryItem.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", outfitName);
+                                    m_log.DebugFormat("[RADMIN]: Outfit {0} load completed", outfitName);
                                 } // foreach outfit
-                                m_log.DebugFormat("[RADMIN] Inventory update complete for {0}", name);
+                                m_log.DebugFormat("[RADMIN]: Inventory update complete for {0}", name);
                                 scene.AvatarService.SetAppearance(ID, avatarAppearance);
                             }
                             catch (Exception e)
                             {
-                                m_log.WarnFormat("[RADMIN] Inventory processing incomplete for user {0} : {1}",
+                                m_log.WarnFormat("[RADMIN]: Inventory processing incomplete for user {0} : {1}",
                                     name, e.Message);
                             }
                         } // End of include
                     }
-                    m_log.DebugFormat("[RADMIN] Default avatar loading complete");
+                    m_log.DebugFormat("[RADMIN]: Default avatar loading complete");
                 }
                 else
                 {
-                    m_log.DebugFormat("[RADMIN] No default avatar information available");
+                    m_log.DebugFormat("[RADMIN]: No default avatar information available");
                     return false;
                 }
             }
             catch (Exception e)
             {
-                m_log.WarnFormat("[RADMIN] Exception whilst loading default avatars ; {0}", e.Message);
+                m_log.WarnFormat("[RADMIN]: Exception whilst loading default avatars ; {0}", e.Message);
                 return false;
             }
 
@@ -2194,8 +2272,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
                 catch (Exception e)
                 {
-                    m_log.InfoFormat("[RADMIN] LoadOAR: {0}", e.Message);
-                    m_log.DebugFormat("[RADMIN] LoadOAR: {0}", e.ToString());
+                    m_log.ErrorFormat("[RADMIN]: LoadOAR: {0} {1}", e.Message, e.StackTrace);
 
                     responseData["loaded"] = false;
                     responseData["error"] = e.Message;
@@ -2300,8 +2377,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.InfoFormat("[RADMIN] SaveOAR: {0}", e.Message);
-                m_log.DebugFormat("[RADMIN] SaveOAR: {0}", e.ToString());
+                m_log.ErrorFormat("[RADMIN]: SaveOAR: {0} {1}", e.Message, e.StackTrace);
 
                 responseData["saved"] = false;
                 responseData["error"] = e.Message;
@@ -2315,7 +2391,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
         private void RemoteAdminOarSaveCompleted(Guid uuid, string name)
         {
-            m_log.DebugFormat("[RADMIN] File processing complete for {0}", name);
+            m_log.DebugFormat("[RADMIN]: File processing complete for {0}", name);
             lock (m_saveOarLock) Monitor.Pulse(m_saveOarLock);
         }
 
@@ -2353,14 +2429,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         UUID region_uuid = (UUID) (string) requestData["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());
+                        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_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);
+                        m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
                     }
                     else throw new Exception("neither region_name nor region_uuid given");
 
@@ -2391,8 +2467,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
                 catch (Exception e)
                 {
-                    m_log.InfoFormat("[RADMIN] LoadXml: {0}", e.Message);
-                    m_log.DebugFormat("[RADMIN] LoadXml: {0}", e.ToString());
+                    m_log.ErrorFormat("[RADMIN] LoadXml: {0} {1}", e.Message, e.StackTrace);
 
                     responseData["loaded"] = false;
                     responseData["switched"] = false;
@@ -2438,14 +2513,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     UUID region_uuid = (UUID) (string) requestData["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());
+                    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_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);
+                    m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
                 }
                 else throw new Exception("neither region_name nor region_uuid given");
 
@@ -2477,8 +2552,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.InfoFormat("[RADMIN] SaveXml: {0}", e.Message);
-                m_log.DebugFormat("[RADMIN] SaveXml: {0}", e.ToString());
+                m_log.ErrorFormat("[RADMIN]: SaveXml: {0} {1}", e.Message, e.StackTrace);
 
                 responseData["saved"] = false;
                 responseData["switched"] = false;
@@ -2517,14 +2591,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     UUID region_uuid = (UUID) (string) requestData["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());
+                    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_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);
+                    m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
                 }
                 else throw new Exception("neither region_name nor region_uuid given");
 
@@ -2536,7 +2610,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.InfoFormat("[RADMIN] RegionQuery: {0}", e.Message);
+                m_log.InfoFormat("[RADMIN]: RegionQuery: {0}", e.Message);
 
                 responseData["success"] = false;
                 responseData["error"] = e.Message;
@@ -2577,7 +2651,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.InfoFormat("[RADMIN] ConsoleCommand: {0}", e.Message);
+                m_log.InfoFormat("[RADMIN]: ConsoleCommand: {0}", e.Message);
 
                 responseData["success"] = false;
                 responseData["error"] = e.Message;
@@ -2614,14 +2688,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     UUID region_uuid = (UUID) (string) requestData["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());
+                    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_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);
+                    m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
                 }
                 else throw new Exception("neither region_name nor region_uuid given");
 
@@ -2632,7 +2706,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.InfoFormat("[RADMIN] Access List Clear Request: {0}", e.Message);
+                m_log.ErrorFormat("[RADMIN]: Access List Clear Request: {0} {1}", e.Message, e.StackTrace);
 
                 responseData["success"] = false;
                 responseData["error"] = e.Message;
@@ -2671,14 +2745,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     UUID region_uuid = (UUID) (string) requestData["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());
+                    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_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);
+                    m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
                 }
                 else throw new Exception("neither region_name nor region_uuid given");
 
@@ -2698,7 +2772,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                         if (account != null)
                         {
                             uuids.Add(account.PrincipalID);
-                            m_log.DebugFormat("[RADMIN] adding \"{0}\" to ACL for \"{1}\"", name, scene.RegionInfo.RegionName);
+                            m_log.DebugFormat("[RADMIN]: adding \"{0}\" to ACL for \"{1}\"", name, scene.RegionInfo.RegionName);
                         }
                     }
                     List<UUID> accessControlList = new List<UUID>(scene.RegionInfo.EstateSettings.EstateAccess);
@@ -2719,7 +2793,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.InfoFormat("[RADMIN] Access List Add Request: {0}", e.Message);
+                m_log.ErrorFormat("[RADMIN]: Access List Add Request: {0} {1}", e.Message, e.StackTrace);
 
                 responseData["success"] = false;
                 responseData["error"] = e.Message;
@@ -2758,14 +2832,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     UUID region_uuid = (UUID) (string) requestData["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());
+                    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_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);
+                    m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
                 }
                 else throw new Exception("neither region_name nor region_uuid given");
 
@@ -2806,7 +2880,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.InfoFormat("[RADMIN] Access List Remove Request: {0}", e.Message);
+                m_log.ErrorFormat("[RADMIN]: Access List Remove Request: {0} {1}", e.Message, e.StackTrace);
 
                 responseData["success"] = false;
                 responseData["error"] = e.Message;
@@ -2845,14 +2919,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     UUID region_uuid = (UUID) (string) requestData["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());
+                    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_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);
+                    m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name);
                 }
                 else throw new Exception("neither region_name nor region_uuid given");
 
@@ -2874,7 +2948,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             }
             catch (Exception e)
             {
-                m_log.InfoFormat("[RADMIN] Acces List List: {0}", e.Message);
+                m_log.ErrorFormat("[RADMIN]: Access List List: {0} {1}", e.Message, e.StackTrace);
 
                 responseData["success"] = false;
                 responseData["error"] = e.Message;