Formatting cleanup.

29 files changed, 231 insertions, 231 deletions

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 1b1f9c7..2aca8ff 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -48,11 +48,11 @@ namespace OpenSim.Grid.AssetServer
 
         public AssetConfig m_config;
 
-        public static OpenAsset_Main assetserver;   
-        
+        public static OpenAsset_Main assetserver;
+
         // Temporarily hardcoded - should be a plugin
-        protected IAssetLoader assetLoader = new AssetLoaderFileSystem();        
-        
+        protected IAssetLoader assetLoader = new AssetLoaderFileSystem();
+
         private IAssetProvider m_assetProvider;
 
         [STAThread]
@@ -81,7 +81,7 @@ namespace OpenSim.Grid.AssetServer
         public OpenAsset_Main()
         {
             m_console = new ConsoleBase("OpenAsset", this);
-            
+
             MainConsole.Instance = m_console;
         }
 
@@ -166,7 +166,7 @@ namespace OpenSim.Grid.AssetServer
 
         public void LoadDefaultAssets()
         {
-            assetLoader.ForEachDefaultXmlAsset(StoreAsset);            
+            assetLoader.ForEachDefaultXmlAsset(StoreAsset);
         }
 
         protected void StoreAsset(AssetBase asset)
@@ -177,9 +177,9 @@ namespace OpenSim.Grid.AssetServer
         public override void RunCmd(string cmd, string[] cmdparams)
         {
             base.RunCmd(cmd, cmdparams);
-            
+
             switch (cmd)
-            {                                   
+            {
                 case "shutdown":
                     m_console.Close();
                     Environment.Exit(0);
diff --git a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
index 6f219a6..52c6e8e 100644
--- a/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 
 [assembly : ComVisible(false)]
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index ece826e..fcf99cd 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Grid.AssetServer
             m_assetManager = assetManager;
             m_assetProvider = assetProvider;
         }
-        
+
         public override byte[] Handle(string path, Stream request)
         {
             string param = GetParam(path);
@@ -68,18 +68,18 @@ namespace OpenSim.Grid.AssetServer
 
             if (p.Length > 0)
             {
-                LLUUID assetID = null;    
-                
+                LLUUID assetID = null;
+
                 if (!LLUUID.TryParse(p[0], out assetID))
                 {
                     m_log.InfoFormat(
                         "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
                     return result;
-                }   
+                }
 
                 if (StatsManager.AssetStats != null)
                     StatsManager.AssetStats.AddRequest();
-                
+
                 AssetBase asset = m_assetProvider.FetchAsset(assetID);
                 if (asset != null)
                 {
@@ -94,7 +94,7 @@ namespace OpenSim.Grid.AssetServer
                     //StreamReader sr = new StreamReader(ms);
 
                     result = ms.GetBuffer();
-                    
+
                     m_log.InfoFormat(
                         "[REST]: GET:/asset found {0} with name {1}, size {2} bytes",
                         assetID, asset.Name, result.Length);
@@ -105,13 +105,13 @@ namespace OpenSim.Grid.AssetServer
                 {
                     if (StatsManager.AssetStats != null)
                         StatsManager.AssetStats.AddNotFoundRequest();
-                    
+
                     m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
                 }
             }
 
-            return result;        
-        }        
+            return result;
+        }
     }
 
     public class PostAssetStreamHandler : BaseStreamHandler
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index c2c212c..83b5319 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -243,22 +243,22 @@ namespace OpenSim.Grid.GridServer
 
         /// <summary>
         /// Checks that it's valid to replace the existing region data with new data
-        /// 
-        /// Currently, this means ensure that the keys passed in by the new region 
+        ///
+        /// Currently, this means ensure that the keys passed in by the new region
         /// match those in the original region.  (XXX Is this correct?  Shouldn't we simply check
         /// against the keys in the current configuration?)
         /// </summary>
         /// <param name="sim"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         protected virtual void ValidateOverwriteKeys(RegionProfileData sim, RegionProfileData existingSim)
-        {            
+        {
             if (!(existingSim.regionRecvKey == sim.regionRecvKey && existingSim.regionSendKey == sim.regionSendKey))
             {
                 throw new LoginException(
                     String.Format(
                         "Authentication failed when trying to login existing region {0} at location {1} {2} currently occupied by {3}"
                             + " with the region's send key {4} (expected {5}) and the region's receive key {6} (expected {7})",
-                            sim.regionName, sim.regionLocX, sim.regionLocY, existingSim.regionName, 
+                            sim.regionName, sim.regionLocX, sim.regionLocY, existingSim.regionName,
                             sim.regionSendKey, existingSim.regionSendKey, sim.regionRecvKey, existingSim.regionRecvKey),
                     "The keys required to login your region did not match the grid server keys.  Please check your grid send and receive keys.");
             }
@@ -266,25 +266,25 @@ namespace OpenSim.Grid.GridServer
 
         /// <summary>
         /// Checks that the new region data is valid.
-        /// 
-        /// Currently, this means checking that the keys passed in by the new region 
+        ///
+        /// Currently, this means checking that the keys passed in by the new region
         /// match those in the grid server's configuration.
         /// </summary>
-        /// 
+        ///
         /// <param name="sim"></param>
         /// <exception cref="LoginException">Thrown if region login failed</exception>
         protected virtual void ValidateNewRegionKeys(RegionProfileData sim)
-        {            
+        {
             if (!(sim.regionRecvKey == Config.SimSendKey && sim.regionSendKey == Config.SimRecvKey))
             {
                 throw new LoginException(
                     String.Format(
                         "Authentication failed when trying to login new region {0} at location {1} {2}"
                             + " with the region's send key {3} (expected {4}) and the region's receive key {5} (expected {6})",
-                            sim.regionName, sim.regionLocX, sim.regionLocY, 
+                            sim.regionName, sim.regionLocX, sim.regionLocY,
                             sim.regionSendKey, Config.SimRecvKey, sim.regionRecvKey, Config.SimSendKey),
                     "The keys required to login your region did not match your existing region keys.  Please check your grid send and receive keys.");
-            }                
+            }
         }
 
         /// <summary>
@@ -295,13 +295,13 @@ namespace OpenSim.Grid.GridServer
         protected virtual void ValidateRegionContactable(RegionProfileData sim)
         {
             string regionStatusUrl = String.Format("{0}{1}", sim.httpServerURI, "simstatus/");
-            string regionStatusResponse;            
-            
+            string regionStatusResponse;
+
             RestClient rc = new RestClient(regionStatusUrl);
-            rc.RequestMethod = "GET";            
-            
+            rc.RequestMethod = "GET";
+
             m_log.DebugFormat("[LOGIN]: Contacting {0} for status of region {1}", regionStatusUrl, sim.regionName);
-            
+
             try
             {
                 Stream rs = rc.Request();
@@ -314,21 +314,21 @@ namespace OpenSim.Grid.GridServer
                 throw new LoginException(
                    String.Format("Region status request to {0} failed", regionStatusUrl),
                    String.Format(
-                       "The grid service could not contact the http url {0} at your region.  Please make sure this url is reachable by the grid service", 
+                       "The grid service could not contact the http url {0} at your region.  Please make sure this url is reachable by the grid service",
                        regionStatusUrl),
                    e);
-            }            
-            
+            }
+
             if (!regionStatusResponse.Equals("OK"))
             {
                 throw new LoginException(
                     String.Format(
-                        "Region {0} at {1} returned status response {2} rather than {3}", 
+                        "Region {0} at {1} returned status response {2} rather than {3}",
                         sim.regionName, regionStatusUrl, regionStatusResponse, "OK"),
                     String.Format(
                         "When the grid service asked for the status of your region, it received the response {0} rather than {1}.  Please check your status",
                         regionStatusResponse, "OK"));
-            }         
+            }
         }
 
         /// <summary>
@@ -373,11 +373,11 @@ namespace OpenSim.Grid.GridServer
                 m_log.Warn("[LOGIN PRELUDE]: Invalid login parameters, sending back error response.");
                 return ErrorResponse("Wrong format in login parameters. Please verify parameters." + e.ToString());
             }
-            
+
             m_log.InfoFormat("[LOGIN BEGIN]: Received login request from simulator: {0}", sim.regionName);
 
             existingSim = GetRegion(sim.regionHandle);
-            
+
             if (existingSim == null || existingSim.UUID == sim.UUID || sim.UUID != sim.originUUID)
             {
                 try
@@ -390,13 +390,13 @@ namespace OpenSim.Grid.GridServer
                     {
                         ValidateOverwriteKeys(sim, existingSim);
                     }
-                    
+
                     ValidateRegionContactable(sim);
                 }
                 catch (LoginException e)
                 {
                     m_log.WarnFormat("[LOGIN END]: {0}", e.Message);
-                    
+
                     return e.XmlRpcErrorResponse;
                 }
 
@@ -489,7 +489,7 @@ namespace OpenSim.Grid.GridServer
             responseData["allow_forceful_banlines"] = Config.AllowForcefulBanlines;
 
             // Instead of sending a multitude of message servers to the registering sim
-            // we should probably be sending a single one and parhaps it's backup 
+            // we should probably be sending a single one and parhaps it's backup
             // that has responsibility over routing it's messages.
 
             // The Sim won't be contacting us again about any of the message server stuff during it's time up.
@@ -583,7 +583,7 @@ namespace OpenSim.Grid.GridServer
 
             sim.regionRecvKey = String.Empty;
             sim.regionSendKey = String.Empty;
-            
+
             if (requestData.ContainsKey("region_secret"))
             {
                 string regionsecret = (string)requestData["region_secret"];
@@ -596,8 +596,8 @@ namespace OpenSim.Grid.GridServer
             else
             {
                 sim.regionSecret = Config.SimRecvKey;
-            }            
-            
+            }
+
             sim.regionDataURI = String.Empty;
             sim.regionAssetURI = Config.DefaultAssetServer;
             sim.regionAssetRecvKey = Config.AssetRecvKey;
@@ -626,7 +626,7 @@ namespace OpenSim.Grid.GridServer
             // not at all. Current strategy is to put the code in place to support the validity of this information
             // and to roll forward debugging any issues from that point
             //
-            // this particular section of the mod attempts to receive a value from the region's xml file by way of 
+            // this particular section of the mod attempts to receive a value from the region's xml file by way of
             // OSG1GridServices for the region's owner
             sim.owner_uuid = (string)requestData["master_avatar_uuid"];
 
@@ -1120,7 +1120,7 @@ namespace OpenSim.Grid.GridServer
             return response;
         }
     }
-    
+
     /// <summary>
     /// Exception generated when a simulator fails to login to the grid
     /// </summary>
@@ -1147,6 +1147,6 @@ namespace OpenSim.Grid.GridServer
         {
             // FIXME: Might be neater to refactor and put the method inside here
             m_xmlRpcErrorResponse = GridManager.ErrorResponse(xmlRpcMessage);
-        }                        
+        }
     }
 }
diff --git a/OpenSim/Grid/GridServer/IGridPlugin.cs b/OpenSim/Grid/GridServer/IGridPlugin.cs
index fbadfce..47273a2 100644
--- a/OpenSim/Grid/GridServer/IGridPlugin.cs
+++ b/OpenSim/Grid/GridServer/IGridPlugin.cs
@@ -23,7 +23,7 @@
 * 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 Mono.Addins;
diff --git a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
index 1468edd..67cff8f 100644
--- a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 
 [assembly : ComVisible(false)]
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 80f0c5e..5388263 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Grid.InventoryServer
     /// </summary>
     public class GridInventoryService : InventoryServiceBase
     {
-        private static readonly ILog m_log 
+        private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback)
@@ -56,31 +56,31 @@ namespace OpenSim.Grid.InventoryServer
         /// <param name="rawUserID"></param>
         /// <returns>The user's inventory.  If an inventory cannot be found then an empty collection is returned.</returns>
         public InventoryCollection GetUserInventory(Guid rawUserID)
-        {           
+        {
             LLUUID userID = new LLUUID(rawUserID);
 
             m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID);
-            
+
             // Uncomment me to simulate a slow responding inventory server
             //Thread.Sleep(16000);
 
             InventoryCollection invCollection = new InventoryCollection();
-            
+
             List<InventoryFolderBase> allFolders = GetInventorySkeleton(userID);
-            
+
             if (null == allFolders)
             {
                 m_log.WarnFormat("[GRID AGENT INVENTORY]: No inventory found for user {0}", rawUserID);
-                
+
                 return invCollection;
             }
-            
+
             List<InventoryItemBase> allItems = new List<InventoryItemBase>();
 
             foreach (InventoryFolderBase folder in allFolders)
             {
                 List<InventoryItemBase> items = RequestFolderItems(folder.ID);
-                
+
                 if (items != null)
                 {
                     allItems.InsertRange(0, items);
@@ -88,36 +88,36 @@ namespace OpenSim.Grid.InventoryServer
             }
 
             invCollection.UserID = userID;
-            invCollection.Folders = allFolders;            
-            invCollection.Items = allItems;            
-            
+            invCollection.Folders = allFolders;
+            invCollection.Items = allItems;
+
 //            foreach (InventoryFolderBase folder in invCollection.Folders)
 //            {
 //                m_log.DebugFormat("[GRID AGENT INVENTORY]: Sending back folder {0} {1}", folder.Name, folder.ID);
 //            }
-//            
+//
 //            foreach (InventoryItemBase item in invCollection.Items)
 //            {
 //                m_log.DebugFormat("[GRID AGENT INVENTORY]: Sending back item {0} {1}, folder {2}", item.Name, item.ID, item.Folder);
 //            }
-            
+
             m_log.InfoFormat(
                 "[GRID AGENT INVENTORY]: Sending back inventory response to user {0} containing {1} folders and {2} items",
-                invCollection.UserID, invCollection.Folders.Count, invCollection.Items.Count);            
-                        
+                invCollection.UserID, invCollection.Folders.Count, invCollection.Items.Count);
+
             return invCollection;
         }
-                
+
         /// <summary>
         /// Guid to UUID wrapper for same name IInventoryServices method
         /// </summary>
         /// <param name="rawUserID"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID)
-        {            
+        {
             LLUUID userID = new LLUUID(rawUserID);
             return GetInventorySkeleton(userID);
-        }        
+        }
 
         /// <summary>
         /// Create an inventory for the given user.
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 2279191..b7c46c2 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.InventoryServer
     public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         private InventoryConfig m_config;
         private GridInventoryService m_inventoryService;
 
@@ -73,7 +73,7 @@ namespace OpenSim.Grid.InventoryServer
             m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect);
 
             m_log.Info("[" + LogName + "]: Starting HTTP server ...");
-            
+
             m_httpServer = new BaseHttpServer(m_config.HttpPort);
             AddHttpHandlers();
             m_httpServer.Start();
@@ -86,11 +86,11 @@ namespace OpenSim.Grid.InventoryServer
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<Guid, InventoryCollection>(
                     "POST", "/GetInventory/", m_inventoryService.GetUserInventory));
-            
+
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<Guid, bool>(
                     "POST", "/CreateInventory/", m_inventoryService.CreateUsersInventory));
-            
+
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<InventoryFolderBase, bool>(
                     "POST", "/NewFolder/", m_inventoryService.AddFolder));
@@ -98,15 +98,15 @@ namespace OpenSim.Grid.InventoryServer
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<InventoryFolderBase, bool>(
                     "POST", "/MoveFolder/", m_inventoryService.MoveFolder));
-            
+
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<InventoryFolderBase, bool>(
-                    "POST", "/PurgeFolder/", m_inventoryService.PurgeFolder));            
+                    "POST", "/PurgeFolder/", m_inventoryService.PurgeFolder));
 
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<InventoryItemBase, bool>(
                     "POST", "/NewItem/", m_inventoryService.AddItem));
-            
+
             m_httpServer.AddStreamHandler(
                 new RestDeserialisehandler<InventoryItemBase, bool>(
                     "POST", "/DeleteItem/", m_inventoryService.DeleteItem));
@@ -134,7 +134,7 @@ namespace OpenSim.Grid.InventoryServer
         public override void RunCmd(string cmd, string[] cmdparams)
         {
             base.RunCmd(cmd, cmdparams);
-            
+
             switch (cmd)
             {
                 case "add-user":
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
index aff4719..06e2f8a 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Util.cs
@@ -82,11 +82,11 @@ namespace OpenSim.Framework.Utilities
         /// Convert a variable length field (byte array) to a string, with a
         /// field name prepended to each line of the output
         /// </summary>
-        /// <remarks>If the byte array has unprintable characters in it, a 
+        /// <remarks>If the byte array has unprintable characters in it, a
         /// hex dump will be put in the string instead</remarks>
         /// <param name="bytes">The byte array to convert to a string</param>
         /// <param name="fieldName">A field name to prepend to each line of output</param>
-        /// <returns>An ASCII string or a string containing a hex dump, minus 
+        /// <returns>An ASCII string or a string containing a hex dump, minus
         /// the null terminator</returns>
         public static string FieldToString(byte[] bytes, string fieldName)
         {
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
index a5a4ec8..27f0d8a 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.ConnectToGridServerDialog.cs
@@ -29,8 +29,8 @@
 //  <autogenerated>
 //      This code was generated by a tool.
 //      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
+//
+//      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
 //  </autogenerated>
 // ------------------------------------------------------------------------------
@@ -52,7 +52,7 @@ namespace OpenGridServices.Manager
         private Gtk.Entry entry3;
         private Gtk.Button button2;
         private Gtk.Button button8;
-        
+
         protected virtual void Build()
         {
             Stetic.Gui.Initialize();
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
index 9707aee..068b9c6 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/OpenGridServices.Manager.MainWindow.cs
@@ -29,8 +29,8 @@
 //  <autogenerated>
 //      This code was generated by a tool.
 //      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
+//
+//      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
 //  </autogenerated>
 // ------------------------------------------------------------------------------
@@ -74,7 +74,7 @@ namespace OpenGridServices.Manager
         private Gtk.DrawingArea drawingarea1;
         private Gtk.TreeView treeview1;
         private Gtk.Statusbar statusbar1;
-        
+
         protected virtual void Build()
         {
             Stetic.Gui.Initialize();
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
index 46dec05..b5fd3f7 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/gtk-gui/generated.cs
@@ -29,8 +29,8 @@
 //  <autogenerated>
 //      This code was generated by a tool.
 //      Mono Runtime Version: 2.0.50727.42
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
+//
+//      Changes to this file may cause incorrect behavior and will be lost if
 //      the code is regenerated.
 //  </autogenerated>
 // ------------------------------------------------------------------------------
@@ -40,20 +40,20 @@ namespace Stetic
     internal class Gui
     {
         private static bool initialized;
-        
+
         internal static void Initialize()
         {
             Stetic.Gui.initialized = true;
         }
     }
-    
+
     internal class ActionGroups
     {
         public static Gtk.ActionGroup GetActionGroup(System.Type type)
         {
             return Stetic.ActionGroups.GetActionGroup(type.FullName);
         }
-        
+
         public static Gtk.ActionGroup GetActionGroup(string name)
         {
             return null;
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 9020ca4..7e9456d 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Grid.MessagingServer
 
         private MessageServerConfig Cfg;
         private MessageService msgsvc;
-        
+
         private LLUUID m_lastCreatedUser = LLUUID.Random();
 
         [STAThread]
@@ -55,7 +55,7 @@ namespace OpenSim.Grid.MessagingServer
 
             m_log.Info("Launching MessagingServer...");
 
-            
+
 
             OpenMessage_Main messageserver = new OpenMessage_Main();
 
@@ -118,7 +118,7 @@ namespace OpenSim.Grid.MessagingServer
             switch (what)
             {
                 case "user":
-                    
+
                     try
                     {
                         //userID =
@@ -140,12 +140,12 @@ namespace OpenSim.Grid.MessagingServer
                     // m_lastCreatedUser = userID;
                     break;
             }
-        }              
+        }
 
         public override void Shutdown()
         {
             msgsvc.deregisterWithUserServer();
-            
+
             base.Shutdown();
         }
     }
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index f9f3669..e1beef1 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -63,13 +63,13 @@ namespace OpenSim.Grid.MessagingServer
         {
             m_cfg = cfg;
         }
-        
+
         #region RegionComms Methods
 
         #endregion
 
         #region FriendList Methods
-        
+
         /// <summary>
         /// Process Friendlist subscriptions for a user
         /// The login method calls this for a User
@@ -93,7 +93,7 @@ namespace OpenSim.Grid.MessagingServer
                 {
                     UserPresenceData friendup = (UserPresenceData)m_presences[uFriendList[i].Friend];
                     // Add backreference
-                    
+
                     SubscribeToPresenceUpdates(userpresence, friendup, uFriendList[i],i);
                 }
             }
@@ -101,14 +101,14 @@ namespace OpenSim.Grid.MessagingServer
 
         /// <summary>
         /// Does the necessary work to subscribe one agent to another's presence notifications
-        /// Gets called by ProcessFriendListSubscriptions.  You shouldn't call this directly 
+        /// Gets called by ProcessFriendListSubscriptions.  You shouldn't call this directly
         /// unless you know what you're doing
         /// </summary>
         /// <param name="userpresence">P1</param>
         /// <param name="friendpresence">P2</param>
         /// <param name="uFriendListItem"></param>
         /// <param name="uFriendListIndex"></param>
-        public void SubscribeToPresenceUpdates(UserPresenceData userpresence, UserPresenceData friendpresence, 
+        public void SubscribeToPresenceUpdates(UserPresenceData userpresence, UserPresenceData friendpresence,
                                                 FriendListItem uFriendListItem, int uFriendListIndex)
         {
             if ((uFriendListItem.FriendListOwnerPerms & (uint)FriendRights.CanSeeOnline) != 0)
@@ -117,7 +117,7 @@ namespace OpenSim.Grid.MessagingServer
                 if (!friendpresence.subscriptionData.Contains(friendpresence.agentData.AgentID))
                 {
                     userpresence.subscriptionData.Add(friendpresence.agentData.AgentID);
-                    //Send Region Notice....   
+                    //Send Region Notice....
                 }
                 else
                 {
@@ -149,13 +149,13 @@ namespace OpenSim.Grid.MessagingServer
 
                 WaitCallback cb2 = new WaitCallback(friendlistupdater.go);
                 ThreadPool.QueueUserWorkItem(cb2);
-                
+
                 //SendRegionPresenceUpdate(userpresence, friendpresence);
             }
         }
 
         /// <summary>
-        /// Adds a backreference so presence specific data doesn't have to be 
+        /// Adds a backreference so presence specific data doesn't have to be
         /// enumerated for each logged in user every time someone logs on or off.
         /// </summary>
         /// <param name="agentID"></param>
@@ -194,7 +194,7 @@ namespace OpenSim.Grid.MessagingServer
                     presenseBackReferences.Remove(agentID);
                 }
 
-                // If there are no more backreferences for this agent, 
+                // If there are no more backreferences for this agent,
                 // remove it to free up memory.
                 if (presenseBackReferences.Count == 0)
                 {
@@ -276,7 +276,7 @@ namespace OpenSim.Grid.MessagingServer
                 }
             }
         }
-        
+
         #endregion
 
         #region UserServer Comms
@@ -342,7 +342,7 @@ namespace OpenSim.Grid.MessagingServer
 
         /// <summary>
         /// UserServer sends an expect_user method
-        /// this handles the method and provisions the 
+        /// this handles the method and provisions the
         /// necessary info for presence to work
         /// </summary>
         /// <param name="request">UserServer Data</param>
@@ -398,9 +398,9 @@ namespace OpenSim.Grid.MessagingServer
 
             return new XmlRpcResponse();
         }
-        
+
         /// <summary>
-        /// The UserServer got a Logoff message 
+        /// The UserServer got a Logoff message
         /// Cleanup time for that user.  Send out presence notifications
         /// </summary>
         /// <param name="request"></param>
@@ -408,7 +408,7 @@ namespace OpenSim.Grid.MessagingServer
         public XmlRpcResponse UserLoggedOff(XmlRpcRequest request)
         {
             Hashtable requestData = (Hashtable)request.Params[0];
-            
+
             LLUUID AgentID = new LLUUID((string)requestData["agentid"]);
 
             ProcessLogOff(AgentID);
@@ -433,7 +433,7 @@ namespace OpenSim.Grid.MessagingServer
             {
                 regionInfo = (RegionProfileData)m_regionInfoCache[regionhandle];
             }
-            else 
+            else
             {
                 regionInfo = RequestRegionInfo(regionhandle);
             }
@@ -457,7 +457,7 @@ namespace OpenSim.Grid.MessagingServer
                 SendParams.Add(requestData);
                 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
                 XmlRpcResponse GridResp = GridReq.Send(m_cfg.GridServerURL, 3000);
-                
+
                 Hashtable responseData = (Hashtable)GridResp.Value;
 
                 if (responseData.ContainsKey("error"))
@@ -479,7 +479,7 @@ namespace OpenSim.Grid.MessagingServer
                 regionProfile.regionHandle = Helpers.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize));
                 regionProfile.regionLocX = regX;
                 regionProfile.regionLocY = regY;
-               
+
                 regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);
                 regionProfile.UUID = new LLUUID((string)responseData["region_UUID"]);
                 regionProfile.regionName = (string)responseData["region_name"];
@@ -498,7 +498,7 @@ namespace OpenSim.Grid.MessagingServer
                             " - Is the GridServer down?");
                 return null;
             }
-           
+
             return regionProfile;
         }
 
@@ -506,19 +506,19 @@ namespace OpenSim.Grid.MessagingServer
         {
             Hashtable UserParams = new Hashtable();
             // Login / Authentication
-            
+
             if (m_cfg.HttpSSL)
             {
                 UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
             }
-            else 
+            else
             {
                 UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
             }
 
             UserParams["recvkey"] = m_cfg.UserRecvKey;
             UserParams["sendkey"] = m_cfg.UserRecvKey;
-            
+
             // Package into an XMLRPC Request
             ArrayList SendParams = new ArrayList();
             SendParams.Add(UserParams);
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index df3bc22..a0aeacc 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -48,9 +48,9 @@ namespace OpenSim.Grid.MessagingServer
             : base("GET", "/presence")
         {
             m_log.Info("[REST]: In Get Request");
-            
+
         }
-        
+
         public override byte[] Handle(string path, Stream request)
         {
             string param = GetParam(path);
@@ -61,8 +61,8 @@ namespace OpenSim.Grid.MessagingServer
 
                 if (p.Length > 0)
                 {
-                    LLUUID assetID = null;    
-                    
+                    LLUUID assetID = null;
+
                     if (!LLUUID.TryParse(p[0], out assetID))
                     {
                         m_log.InfoFormat(
@@ -101,7 +101,7 @@ namespace OpenSim.Grid.MessagingServer
         public PostXMPPStreamHandler()
             : base("POST", "/presence")
         {
-            
+
         }
 
     }
diff --git a/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs
index 3d06232..d18822c 100644
--- a/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/ScriptEngine/Common/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 
 [assembly : ComVisible(false)]
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
index 072c86c..639cd54 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL2CSConverter.cs
@@ -165,7 +165,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL
                     // if level == 0, add to return
                     if (ilevel == 1 && lastlevel == 0)
                     {
-                        // 0 => 1: Get last 
+                        // 0 => 1: Get last
                         Match m =
                             Regex.Match(cache, @"(?![a-zA-Z_]+)\s*([a-zA-Z_]+)[^a-zA-Z_\(\)]*{",
                                         RegexOptions.Compiled | RegexOptions.Multiline | RegexOptions.Singleline);
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
index f957d63..60f4d42 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -98,9 +98,9 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL
                               ads.ConfigurationFile
                 );
 
-            // Display the name of the calling AppDomain and the name 
+            // Display the name of the calling AppDomain and the name
             // of the second domain.
-            // NOTE: The application's thread has transitioned between 
+            // NOTE: The application's thread has transitioned between
             // AppDomains.
             Console.WriteLine("Calling to '{0}'.",
                               Thread.GetDomain().FriendlyName
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs
index 4ec8618..f7c8fb1 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/Engine.cs
@@ -167,7 +167,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
             Common.SendToDebug("IL_CREATE_CONSTRUCTOR()");
             //ConstructorBuilder constructor = typeBuilder.DefineConstructor(
             //            MethodAttributes.Public,
-            //            CallingConventions.Standard, 
+            //            CallingConventions.Standard,
             //            new Type[0]);
             ConstructorBuilder constructor = typeBuilder.DefineConstructor(
                 MethodAttributes.Public |
@@ -191,8 +191,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
             //// Create state object
             //FieldName = "State";
             //FieldBuilder State_fb = typeBuilder.DefineField(
-            //    FieldName, 
-            //    typeof(UInt32), 
+            //    FieldName,
+            //    typeof(UInt32),
             //    FieldAttributes.Public);
             //il.Emit(OpCodes.Ldarg_0);
             //il.Emit(OpCodes.Ldc_I4, 0);
@@ -205,8 +205,8 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
 
             //FieldName = "LSL_BuiltIns";
             //FieldBuilder LSL_BuiltIns_fb = typeBuilder.DefineField(
-            //    FieldName, 
-            //    objType1, 
+            //    FieldName,
+            //    objType1,
             //    FieldAttributes.Public);
 
             ////LSL_BuiltIn_Commands_TestImplementation _ti = new LSL_BuiltIn_Commands_TestImplementation();
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_OPCODES.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_OPCODES.cs
index 05f7611..11b567e 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_OPCODES.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSL_BaseClass_OPCODES.cs
@@ -36,9 +36,9 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
          *
          * These are internal "assembly" commands,
          *  basic operators like "ADD", "PUSH" and "POP"
-         * 
+         *
          * It also contains managed stack and keeps track of internal variables, etc.
-         * 
+         *
          */
 
 
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Parser.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Parser.cs
index 9189bf6..25d1211 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Parser.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSO/LSO_Parser.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
         /// </summary>
         public void Parse()
         {
-            // The LSO Format consist of 6 major blocks: header, statics, functions, states, heap, and stack. 
+            // The LSO Format consist of 6 major blocks: header, statics, functions, states, heap, and stack.
 
 
             // HEADER BLOCK
@@ -295,7 +295,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
                 myEventCodeChunk = new LSO_Struct.CodeChunk[myStateFrameBlock.StateCount];
                 for (int i = 0; i < myStateFrameBlock.StateCount; i++)
                 {
-                    // TODO: Somehow organize events and functions so they can be found again, 
+                    // TODO: Somehow organize events and functions so they can be found again,
                     // two level search ain't no good
                     for (int ii = 0; ii < myStateFrameBlock.StatePointer[i].EventMask.Count - 1; ii++)
                     {
@@ -373,7 +373,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSO
 
         //private byte[] br_read_smallendian(int len)
         //{
-        //    byte[] bytes = new byte[len];    
+        //    byte[] bytes = new byte[len];
         //    br.Read(bytes,0, len);
         //    return bytes;
         //}
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
index d724d22..0d2d7cf 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
         public void OnRezScript(uint localID, LLUUID itemID, string script)
         {
             //myScriptEngine.myScriptManager.StartScript(
-            //    Path.Combine("ScriptEngines", "Default.lsl"), 
+            //    Path.Combine("ScriptEngines", "Default.lsl"),
             //    new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost()
             //);
             Console.WriteLine("OnRezScript localID: " + localID + " LLUID: " + itemID.ToString() + " Size: " +
@@ -78,7 +78,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine
         public void OnRemoveScript(uint localID, LLUUID itemID)
         {
             //myScriptEngine.myScriptManager.StartScript(
-            //    Path.Combine("ScriptEngines", "Default.lsl"), 
+            //    Path.Combine("ScriptEngines", "Default.lsl"),
             //    new OpenSim.Region.Environment.Scenes.Scripting.NullScriptHost()
             //);
             Console.WriteLine("OnRemoveScript localID: " + localID + " LLUID: " + itemID.ToString());
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs
index 351f26b..060ae0b 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 
 [assembly : ComVisible(false)]
@@ -54,11 +54,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Revision and Build Numbers 
+// You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
 [assembly : AssemblyVersion("1.0.0.0")]
diff --git a/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs
index e4161d3..0ec6d6c 100644
--- a/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/ScriptServer/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 
 [assembly : ComVisible(false)]
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 00b7f76..79524b4 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -48,10 +48,10 @@ namespace OpenSim.Grid.UserServer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private UserConfig Cfg;
-        
+
         public UserManager m_userManager;
         public UserLoginService m_loginService;
-        public MessageServersConnector m_messagesService;        
+        public MessageServersConnector m_messagesService;
 
         private LLUUID m_lastCreatedUser = LLUUID.Random();
 
@@ -87,13 +87,13 @@ namespace OpenSim.Grid.UserServer
         public void Startup()
         {
             Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
-            
+
             m_stats = StatsManager.StartCollectingUserStats();
 
             m_log.Info("[REGION]: Establishing data connection");
-            m_userManager = new UserManager();            
+            m_userManager = new UserManager();
             m_userManager._config = Cfg;
-            m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect);            
+            m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect);
 
             m_loginService = new UserLoginService(
                  m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
@@ -104,7 +104,7 @@ namespace OpenSim.Grid.UserServer
             m_userManager.OnLogOffUser += NotifyMessageServersUserLoggOff;
 
             m_log.Info("[REGION]: Starting HTTP process");
-            
+
             m_httpServer = new BaseHttpServer(Cfg.HttpPort);
             AddHttpHandlers();
             m_httpServer.Start();
@@ -117,7 +117,7 @@ namespace OpenSim.Grid.UserServer
             m_httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod);
 
             m_httpServer.AddHTTPHandler("login", m_loginService.ProcessHTMLLogin);
-            
+
             m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod);
 
             m_httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName);
@@ -128,7 +128,7 @@ namespace OpenSim.Grid.UserServer
             m_httpServer.AddXmlRPCHandler("update_user_friend_perms", m_userManager.XmlRpcResponseXmlRPCUpdateUserFriendPerms);
             m_httpServer.AddXmlRPCHandler("get_user_friend_list", m_userManager.XmlRpcResponseXmlRPCGetUserFriendList);
             m_httpServer.AddXmlRPCHandler("logout_of_simulator", m_userManager.XmlRPCLogOffUserMethodUUID);
-           
+
             // Message Server ---> User Server
             m_httpServer.AddXmlRPCHandler("register_messageserver", m_messagesService.XmlRPCRegisterMessageServer);
             m_httpServer.AddXmlRPCHandler("agent_change_region", m_messagesService.XmlRPCUserMovedtoRegion);
@@ -163,17 +163,17 @@ namespace OpenSim.Grid.UserServer
                     {
                         m_log.ErrorFormat(
                             "[USERS]: A user with the name {0} {1} already exists!", tempfirstname, templastname);
-                    
+
                         break;
                     }
-                    
+
                     tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
 
                     LLUUID userID = new LLUUID();
                     try
                     {
                         userID = m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY);
-                    } 
+                    }
                     catch (Exception ex)
                     {
                         m_log.ErrorFormat("[USERS]: Error creating user: {0}", ex.ToString());
@@ -181,31 +181,31 @@ namespace OpenSim.Grid.UserServer
 
                     try
                     {
-                        bool created 
+                        bool created
                             = SynchronousRestObjectPoster.BeginPostObject<Guid, bool>(
                                 "POST", m_userManager._config.InventoryUrl + "CreateInventory/", userID.UUID);
-                    
+
                         if (!created)
                         {
                             throw new Exception(
                                 String.Format(
                                     "The inventory creation request for user {0} did not succeed."
-                                        + "  Please contact your inventory service provider for more information.", 
+                                        + "  Please contact your inventory service provider for more information.",
                                     userID));
                         }
-                       
+
                     }
                     catch (WebException)
                     {
                         m_log.ErrorFormat(
-                            "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", 
+                            "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}",
                             m_userManager._config.InventoryUrl + "CreateInventory/", userID.UUID);
                     }
                     catch (Exception e)
                     {
                         m_log.ErrorFormat("[USERS]: Error creating inventory for user: {0}", e);
                     }
-                
+
                     m_lastCreatedUser = userID;
                     break;
             }
@@ -214,7 +214,7 @@ namespace OpenSim.Grid.UserServer
         public override void RunCmd(string cmd, string[] cmdparams)
         {
             base.RunCmd(cmd, cmdparams);
-            
+
             switch (cmd)
             {
                 case "help":
@@ -223,7 +223,7 @@ namespace OpenSim.Grid.UserServer
 
                 case "create":
                     do_create(cmdparams[0]);
-                    break;                  
+                    break;
 
                 case "test-inventory":
                     //  RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>();
@@ -242,10 +242,10 @@ namespace OpenSim.Grid.UserServer
         public override void Shutdown()
         {
             m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation;
-            
+
             base.Shutdown();
         }
-        
+
         public void TestResponse(List<InventoryFolderBase> resp)
         {
             m_console.Notice("response got");
@@ -257,10 +257,10 @@ namespace OpenSim.Grid.UserServer
         }
 
         public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
-                                                                ulong regionhandle, float positionX, float positionY, 
+                                                                ulong regionhandle, float positionX, float positionY,
                                                                 float positionZ, string firstname, string lastname)
         {
-            
+
             m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, positionX,
                                                           positionY,  positionZ, firstname, lastname);
         }
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 4e9728e..529c089 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -41,12 +41,12 @@ namespace OpenSim.Grid.UserServer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public Dictionary<string, MessageServerInfo> MessageServers;
-        
+
         public MessageServersConnector()
         {
             MessageServers = new Dictionary<string, MessageServerInfo>();
         }
-        
+
         public void RegisterMessageServer(string URI, MessageServerInfo serverData)
         {
             lock (MessageServers)
@@ -55,7 +55,7 @@ namespace OpenSim.Grid.UserServer
                     MessageServers.Add(URI, serverData);
             }
         }
-        
+
         public void DeRegisterMessageServer(string URI)
         {
             lock (MessageServers)
@@ -64,7 +64,7 @@ namespace OpenSim.Grid.UserServer
                     MessageServers.Remove(URI);
             }
         }
-        
+
         public void AddResponsibleRegion(string URI, ulong regionhandle)
         {
             if (!MessageServers.ContainsKey(URI))
@@ -76,7 +76,7 @@ namespace OpenSim.Grid.UserServer
                 MessageServerInfo msginfo = MessageServers["URI"];
                 msginfo.responsibleForRegions.Add(regionhandle);
                 MessageServers["URI"] = msginfo;
-            }   
+            }
         }
         public void RemoveResponsibleRegion(string URI, ulong regionhandle)
         {
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.UserServer
                     msginfo.responsibleForRegions.Remove(regionhandle);
                     MessageServers["URI"] = msginfo;
                 }
-            }   
+            }
 
         }
         public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request)
@@ -148,7 +148,7 @@ namespace OpenSim.Grid.UserServer
                 string scurrentpos = (string)requestData["currentpos"];
                 //LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
                 // TODO: Okay now raise event so the user server can pass this data to the Usermanager
-                
+
                 responseData["responsestring"] = "TRUE";
                 response.Value = responseData;
             }
@@ -156,7 +156,7 @@ namespace OpenSim.Grid.UserServer
         }
 
         public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
-                                                ulong regionhandle, float positionX, float positionY, 
+                                                ulong regionhandle, float positionX, float positionY,
                                                 float positionZ, string firstname, string lastname)
         {
             // Loop over registered Message Servers (AND THERE WILL BE MORE THEN ONE :D)
@@ -218,9 +218,9 @@ namespace OpenSim.Grid.UserServer
             m_log.Info("[LOGOUT]: Notified : " + serv.URI + " about user logout");
         }
 
-        private void NotifyMessageServerAboutUser(MessageServerInfo serv, 
+        private void NotifyMessageServerAboutUser(MessageServerInfo serv,
                                                     LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
-                                                    ulong regionhandle, float positionX, float positionY, float positionZ, 
+                                                    ulong regionhandle, float positionX, float positionY, float positionZ,
                                                     string firstname, string lastname)
         {
             Hashtable reqparams = new Hashtable();
@@ -250,7 +250,7 @@ namespace OpenSim.Grid.UserServer
             {
                 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login.  Presence might be borked for this user");
             }
-            
+
         }
     }
 }
diff --git a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
index 680b357..926f680 100644
--- a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
 [assembly : AssemblyTrademark("")]
 [assembly : AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 
 [assembly : ComVisible(false)]
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 32b1ada..3c9d650 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -50,11 +50,11 @@ namespace OpenSim.Grid.UserServer
         public event UserLoggedInAtLocation OnUserLoggedInAtLocation;
 
         private UserLoggedInAtLocation handlerUserLoggedInAtLocation = null;
-       
+
         public UserConfig m_config;
 
         public UserLoginService(
-            UserManagerBase userManager, LibraryRootFolder libraryRootFolder, 
+            UserManagerBase userManager, LibraryRootFolder libraryRootFolder,
             UserConfig config, string welcomeMess)
             : base(userManager, libraryRootFolder, welcomeMess)
         {
@@ -138,9 +138,9 @@ namespace OpenSim.Grid.UserServer
                                 theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "]}";
 
                 // Destination
-                //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into 
+                //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into
                 //CFK: the next one for X & Y and comment this one.
-                //CFK: m_log.Info("[LOGIN]: CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + 
+                //CFK: m_log.Info("[LOGIN]: CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX +
                 //CFK: "; Region Y: " + SimInfo.regionLocY);
                 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverURI.Split(new char[] { '/', ':' })[3]).ToString();
                 response.SimPort = uint.Parse(SimInfo.serverURI.Split(new char[] { '/', ':' })[4]);
@@ -150,15 +150,15 @@ namespace OpenSim.Grid.UserServer
                 //Not sure if the + "/CAPS/" should in fact be +"CAPS/" depending if there is already a / as part of httpServerURI
                 string capsPath = Util.GetRandomCapsPath();
                 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/";
-                
+
                 m_log.DebugFormat(
-                    "[LOGIN]: Sending new CAPS seed url {0} to client {1}", 
-                    response.SeedCapability, response.AgentID);                 
+                    "[LOGIN]: Sending new CAPS seed url {0} to client {1}",
+                    response.SeedCapability, response.AgentID);
 
                 // Notify the target of an incoming user
-                //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into 
+                //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into
                 //CFK: the next one for X & Y and comment this one.
-                //CFK: m_log.Info("[LOGIN]: " + SimInfo.regionName + " (" + SimInfo.serverURI + ")  " + 
+                //CFK: m_log.Info("[LOGIN]: " + SimInfo.regionName + " (" + SimInfo.serverURI + ")  " +
                 //CFK:    SimInfo.regionLocX + "," + SimInfo.regionLocY);
 
                 theUser.CurrentAgent.Region = SimInfo.UUID;
@@ -187,23 +187,23 @@ namespace OpenSim.Grid.UserServer
                 // Update agent with target sim
 
                 m_log.InfoFormat(
-                    "[LOGIN]: Telling region {0} @ {1},{2} ({3}) to expect user connection", 
-                    SimInfo.regionName, response.RegionX, response.RegionY, SimInfo.httpServerURI); 
+                    "[LOGIN]: Telling region {0} @ {1},{2} ({3}) to expect user connection",
+                    SimInfo.regionName, response.RegionX, response.RegionY, SimInfo.httpServerURI);
 
-                XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);                
+                XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
                 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
-                
+
                 if (GridResp.IsFault)
                 {
                     m_log.ErrorFormat(
-                        "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}", 
+                        "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}",
                         SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString);
                 }
                 handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation;
                 if (handlerUserLoggedInAtLocation != null)
                 {
                     //m_log.Info("[LOGIN]: Letting other objects know about login");
-                    handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.Region, 
+                    handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.Region,
                         theUser.CurrentAgent.Handle, theUser.CurrentAgent.Position.X,theUser.CurrentAgent.Position.Y,theUser.CurrentAgent.Position.Z,
                         theUser.FirstName,theUser.SurName);
                 }
@@ -213,7 +213,7 @@ namespace OpenSim.Grid.UserServer
             {
                 tryDefault = true;
             }
-            
+
             if (tryDefault)
             {
                 // Send him to default region instead
@@ -301,8 +301,8 @@ namespace OpenSim.Grid.UserServer
         protected override InventoryData GetInventorySkeleton(LLUUID userID)
         {
             m_log.DebugFormat(
-                 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", 
-                 m_config.InventoryUrl, userID);            
+                 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}",
+                 m_config.InventoryUrl, userID);
 
             List<InventoryFolderBase> folders
                 = SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>(
@@ -317,23 +317,23 @@ namespace OpenSim.Grid.UserServer
                 // tools are creating the user profile directly in the database without creating the inventory.  At
                 // this time we'll accomodate them by lazily creating the user inventory now if it doesn't already
                 // exist.
-                bool created = 
+                bool created =
                     SynchronousRestObjectPoster.BeginPostObject<Guid, bool>(
                         "POST", m_config.InventoryUrl + "CreateInventory/", userID.UUID);
-                
+
                 if (!created)
                 {
                     throw new Exception(
                         String.Format(
                             "The inventory creation request for user {0} did not succeed."
-                                + "  Please contact your inventory service provider for more information.", 
+                                + "  Please contact your inventory service provider for more information.",
                             userID));
                 }
                 else
                 {
                     m_log.InfoFormat("[LOGIN]: A new inventory skeleton was successfully created for user {0}", userID);
                 }
-                
+
                 folders = SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>(
                     "POST", m_config.InventoryUrl + "RootFolders/", userID.UUID);
             }
@@ -343,11 +343,11 @@ namespace OpenSim.Grid.UserServer
                 LLUUID rootID = LLUUID.Zero;
                 ArrayList AgentInventoryArray = new ArrayList();
                 Hashtable TempHash;
-                
+
                 foreach (InventoryFolderBase InvFolder in folders)
                 {
 //                    m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name);
-                    
+
                     if (InvFolder.ParentID == LLUUID.Zero)
                     {
                         rootID = InvFolder.ID;
@@ -360,14 +360,14 @@ namespace OpenSim.Grid.UserServer
                     TempHash["folder_id"] = InvFolder.ID.ToString();
                     AgentInventoryArray.Add(TempHash);
                 }
-                
+
                 return new InventoryData(AgentInventoryArray, rootID);
             }
             else
             {
                 throw new Exception(
                     String.Format(
-                        "A root inventory folder for user {0} could not be retrieved from the inventory service", 
+                        "A root inventory folder for user {0} could not be retrieved from the inventory service",
                         userID));
             }
         }
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 5d0e1d6..8372d6a 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.UserServer
     public delegate void logOffUser(LLUUID AgentID);
 
     public class UserManager : UserManagerBase
-    {            
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public event logOffUser OnLogOffUser;
@@ -91,7 +91,7 @@ namespace OpenSim.Grid.UserServer
                 responseData["lastname" + i.ToString()] = returnUsers[i].lastName;
             }
             response.Value = responseData;
-            
+
             return response;
         }
 
@@ -182,7 +182,7 @@ namespace OpenSim.Grid.UserServer
             Hashtable responseData = new Hashtable();
             string returnString = "FALSE";
             // Query Result Information
-            
+
             if (requestData.Contains("ownerID") && requestData.Contains("friendID") && requestData.Contains("friendPerms"))
             {
                 // UserManagerBase.AddNewuserFriend
@@ -201,7 +201,7 @@ namespace OpenSim.Grid.UserServer
             Hashtable responseData = new Hashtable();
             string returnString = "FALSE";
             // Query Result Information
-            
+
             if (requestData.Contains("ownerID") && requestData.Contains("friendID"))
             {
                 // UserManagerBase.AddNewuserFriend
@@ -219,7 +219,7 @@ namespace OpenSim.Grid.UserServer
             Hashtable requestData = (Hashtable)request.Params[0];
             Hashtable responseData = new Hashtable();
             string returnString = "FALSE";
-           
+
             if (requestData.Contains("ownerID") && requestData.Contains("friendID") && requestData.Contains("friendPerms"))
             {
                 UpdateUserFriendPerms(new LLUUID((string)requestData["ownerID"]), new LLUUID((string)requestData["friendID"]), (uint)Convert.ToInt32((string)requestData["friendPerms"]));
@@ -243,7 +243,7 @@ namespace OpenSim.Grid.UserServer
             {
                 returndata = this.GetUserFriendList(new LLUUID((string)requestData["ownerID"]));
             }
-            
+
             return FriendListItemListtoXmlRPCResponse(returndata);
         }
 
@@ -350,7 +350,7 @@ namespace OpenSim.Grid.UserServer
             }
             // dont' know how yet
             if (requestData.Contains("MaturePublish"))
-            {                
+            {
             }
             if (requestData.Contains("AboutText"))
             {
@@ -362,7 +362,7 @@ namespace OpenSim.Grid.UserServer
             }
             // not in DB yet.
             if (requestData.Contains("ProfileURL"))
-            {                
+            {
             }
             if (requestData.Contains("home_region"))
             {
@@ -382,7 +382,7 @@ namespace OpenSim.Grid.UserServer
                 {
                     m_log.Error("[PROFILE]:Failed to set home region, Value was too large");
                 }
-                
+
             }
             if (requestData.Contains("home_pos_x"))
             {
@@ -442,7 +442,7 @@ namespace OpenSim.Grid.UserServer
             }
             if (requestData.Contains("home_look_z"))
             {
-                try 
+                try
                 {
                     userProfile.HomeLookAtZ = (float)Convert.ToDecimal((string)requestData["home_look_z"]);
                 }