16 files changed, 60 insertions, 70 deletions

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 4a4f8bf..6d46048 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Grid.AssetServer
         public override void Startup()
         {
             base.Startup();
-            
+
             AssetConfig config = new AssetConfig("ASSET SERVER", (Path.Combine(Util.configDir(), "AssetServer_Config.xml")));
 
             m_log.Info("[ASSET]: Setting up asset DB");
@@ -115,17 +115,17 @@ namespace OpenSim.Grid.AssetServer
 
         public IAssetProviderPlugin LoadDatabasePlugin(string provider, string connect)
         {
-            PluginLoader<IAssetProviderPlugin> loader = 
+            PluginLoader<IAssetProviderPlugin> loader =
                 new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect));
 
-            // loader will try to load all providers (MySQL, MSSQL, etc) 
+            // loader will try to load all providers (MySQL, MSSQL, etc)
             // unless it is constrainted to the correct "Provider" entry in the addin.xml
             loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider));
             loader.Load();
 
             return loader.Plugin;
         }
-        
+
         public void setupDB(AssetConfig config)
         {
             try
diff --git a/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs b/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs
index eed4621..a36d396 100644
--- a/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs
+++ b/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs
@@ -40,17 +40,17 @@ namespace OpenSim.Grid.Communications.OGS1
     public class OGS1InterServiceInventoryService : IInterServiceInventoryServices
     {
         protected Uri m_inventoryServerUrl;
-        
+
         public OGS1InterServiceInventoryService(Uri inventoryServerUrl)
         {
             m_inventoryServerUrl = inventoryServerUrl;
         }
-        
+
         /// <summary>
         /// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/>
         /// </summary>
         /// <param name="userId"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         public bool CreateNewUserInventory(LLUUID userId)
         {
             return SynchronousRestObjectPoster.BeginPostObject<Guid, bool>(
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 3101a38..98abd53 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -61,20 +61,20 @@ namespace OpenSim.Grid.GridServer
         /// <param name="provider">The name of the grid server plugin DLL</param>
         public void AddPlugin(string provider, string connect)
         {
-            PluginLoader<IGridDataPlugin> gridloader = 
+            PluginLoader<IGridDataPlugin> gridloader =
                 new PluginLoader<IGridDataPlugin> (new GridDataInitialiser (connect));
 
-            PluginLoader<ILogDataPlugin> logloader = 
+            PluginLoader<ILogDataPlugin> logloader =
                 new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect));
 
-            // loader will try to load all providers (MySQL, MSSQL, etc) 
+            // loader will try to load all providers (MySQL, MSSQL, etc)
             // unless it is constrainted to the correct "Provider" entry in the addin.xml
             gridloader.Add ("/OpenSim/GridData", new PluginProviderFilter (provider));
             logloader.Add ("/OpenSim/LogData", new PluginProviderFilter (provider));
-            
+
             gridloader.Load();
             logloader.Load();
-            
+
             _plugins = gridloader.Plugins;
             _logplugins = logloader.Plugins;
         }
@@ -382,7 +382,7 @@ namespace OpenSim.Grid.GridServer
                     string logMsg = e.Message;
                     if (e.InnerException != null)
                         logMsg += ", " + e.InnerException.Message;
-                    
+
                     m_log.WarnFormat("[LOGIN END]: {0}", logMsg);
 
                     return e.XmlRpcErrorResponse;
diff --git a/OpenSim/Grid/GridServer/IGridPlugin.cs b/OpenSim/Grid/GridServer/IGridPlugin.cs
index 71c357b..e2557c0 100644
--- a/OpenSim/Grid/GridServer/IGridPlugin.cs
+++ b/OpenSim/Grid/GridServer/IGridPlugin.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Grid.GridServer
     {
         void Initialise(GridServerBase gridServer);
     }
-    
+
     public class GridPluginInitialiser : PluginInitialiserBase
     {
         private GridServerBase server;
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 643cf4d..e4d43d4 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -84,12 +84,12 @@ namespace OpenSim.Grid.InventoryServer
                     {
                         return true;
                     }
-                }                
-                
+                }
+
                 m_log.WarnFormat(
-                    "[GRID AGENT INVENTORY]: Rejecting request since source {0} was not in the list of trusted sources", 
-                    peer);    
-                
+                    "[GRID AGENT INVENTORY]: Rejecting request since source {0} was not in the list of trusted sources",
+                    peer);
+
                 return false;
             }
             else
@@ -110,7 +110,7 @@ namespace OpenSim.Grid.InventoryServer
             if (m_doLookup)
             {
                 m_log.InfoFormat("[GRID AGENT INVENTORY]: checking authed session {0} {1}", session_id, avatar_id);
-                
+
                 if (m_session_cache.getCachedSession(session_id, avatar_id) == null)
                 {
                     // cache miss, ask userserver
@@ -137,7 +137,7 @@ namespace OpenSim.Grid.InventoryServer
                     m_log.Info("[GRID AGENT INVENTORY]: got authed session from cache");
                     return true;
                 }
-                
+
                 m_log.Warn("[GRID AGENT INVENTORY]: unknown session_id, request rejected");
                 return false;
             }
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index 7e6a29b..a77c570 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Grid.InventoryServer
         public override void Startup()
         {
             base.Startup();
-            
+
             InventoryConfig config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml")));
 
             m_inventoryService = new GridInventoryService(config.UserServerURL);
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
index 210e195..06bcee2 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/ConnectToGridServerDialog.cs
@@ -43,10 +43,10 @@ namespace OpenGridServices.Manager
             {
                 case Gtk.ResponseType.Ok:
                     MainClass.PendingOperations.Enqueue("connect_to_gridserver " + this.entry1.Text + " " + this.entry2.Text + " " + this.entry3.Text);
-                break;
-                
+                    break;
+
                 case Gtk.ResponseType.Cancel:
-                break;
+                    break;
             }
             this.Hide();
         }
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
index cf44ac2..c39e72a 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/GridServerConnectionManager.cs
@@ -41,9 +41,9 @@ namespace OpenGridServices.Manager
         private string ServerURL;
         public LLUUID SessionID;
         public bool connected=false;
-        
+
         public RegionBlock[][] WorldMap;
-        
+
         public bool Connect(string GridServerURL, string username, string password)
         {
             try
@@ -76,14 +76,14 @@ namespace OpenGridServices.Manager
                 return false;
             }
         }
-        
+
         public void DownloadMap()
         {
             System.Net.WebClient mapdownloader = new WebClient();
             Stream regionliststream = mapdownloader.OpenRead(ServerURL + "/regionlist");
-            
+
             RegionBlock TempRegionData;
-            
+
             XmlDocument doc = new XmlDocument();
             doc.Load(regionliststream);
             regionliststream.Close();
@@ -105,12 +105,12 @@ namespace OpenGridServices.Manager
                 }
             }
         }
-        
+
         public bool RestartServer()
         {
             return true;
         }
-        
+
         public bool ShutdownServer()
         {
             try
@@ -137,7 +137,7 @@ namespace OpenGridServices.Manager
                 return false;
             }
         }
-    
+
         public void DisconnectServer()
         {
             this.connected=false;
diff --git a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
index 7700229..f081665 100644
--- a/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
+++ b/OpenSim/Grid/Manager/OpenGridServices.Manager/Main.cs
@@ -38,9 +38,9 @@ namespace OpenGridServices.Manager
         public static BlockingQueue<string> PendingOperations = new BlockingQueue<string>();
 
         private static Thread OperationsRunner;
-        
+
         private static GridServerConnectionManager gridserverConn;
-        
+
         private static MainWindow win;
 
         public static void DoMainLoop()
@@ -79,7 +79,7 @@ namespace OpenGridServices.Manager
                             win.SetStatus("Could not connect");
                         }
                         break;
-                    
+
                     case "restart_gridserver":
                         win.SetStatus("Restarting grid server...");
                         if (gridserverConn.RestartServer())
@@ -93,7 +93,7 @@ namespace OpenGridServices.Manager
                             win.SetStatus("Error restarting grid server!!!");
                         }
                         break;
-                    
+
                     case "shutdown_gridserver":
                         win.SetStatus("Shutting down grid server...");
                         if (gridserverConn.ShutdownServer())
@@ -108,7 +108,7 @@ namespace OpenGridServices.Manager
                             win.SetStatus("Could not shutdown grid server!!!");
                         }
                         break;
-                    
+
                     case "disconnect_gridserver":
                         gridserverConn.DisconnectServer();
                         win.SetGridServerConnected(false);
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index de20d01..c80d48c 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -83,14 +83,12 @@ namespace OpenSim.Grid.MessagingServer
         public override void Startup()
         {
             base.Startup();
-            
+
             Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml")));
 
             m_log.Info("[REGION]: Starting HTTP process");
             m_httpServer = new BaseHttpServer(Cfg.HttpPort);
 
-            
-
             msgsvc = new MessageService(Cfg);
 
             if (msgsvc.registerWithUserServer())
@@ -123,7 +121,6 @@ namespace OpenSim.Grid.MessagingServer
             switch (what)
             {
                 case "user":
-
                     try
                     {
                         //userID =
@@ -161,8 +158,6 @@ namespace OpenSim.Grid.MessagingServer
                     m_console.Notice("Region cache cleared! Cleared " + entries.ToString() + " entries");
                     break;
             }
-
-                
         }
 
         public override void Shutdown()
diff --git a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
index 5f60871..281beb9 100644
--- a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Grid.MessagingServer
             }
             return result;
         }
-        
+
         public int Count
         {
             get
diff --git a/OpenSim/Grid/ScriptServer/FakeScene.cs b/OpenSim/Grid/ScriptServer/FakeScene.cs
index 89e7efb..ef88a9d 100644
--- a/OpenSim/Grid/ScriptServer/FakeScene.cs
+++ b/OpenSim/Grid/ScriptServer/FakeScene.cs
@@ -45,7 +45,6 @@ namespace OpenSim.Grid.ScriptServer
                 regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, httpServer,
                 moduleLoader, dumpAssetsToFile, physicalPrim, sendTasksToChild, config, "")
         {
-            
         }
 
         // What does a scene have to do? :P
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index 844f27d..63bdea8 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Grid.ScriptServer
         internal TCPServer m_TCPServer;
         internal TRPC_Remote RPC;
 
-                public ScriptServerMain()
+        public ScriptServerMain()
         {
             m_console = CreateConsole();
 
@@ -68,7 +68,6 @@ namespace OpenSim.Grid.ScriptServer
             Engine = ScriptEngines.LoadEngine("DotNetEngine");
 
             Engine.InitializeEngine(null, null, false, Engine.GetScriptManager());
-                    
 
             // Set up server
             //m_RemotingServer = new RemotingServer(listenPort, "DotNetEngine");
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 9b74dbc..9a3e431 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Grid.UserServer
         public override void Startup()
         {
             base.Startup();
-            
+
             Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
 
             m_stats = StatsManager.StartCollectingUserStats();
@@ -101,11 +101,11 @@ namespace OpenSim.Grid.UserServer
 
             m_gridInfoService = new GridInfoService();
 
-            m_interServiceInventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl);            
+            m_interServiceInventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl);
 
             m_loginService = new UserLoginService(
-                 m_userManager, m_interServiceInventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);            
-            
+                 m_userManager, m_interServiceInventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
+
             m_messagesService = new MessageServersConnector();
 
             m_loginService.OnUserLoggedInAtLocation += NotifyMessageServersUserLoggedInToLocation;
@@ -151,7 +151,6 @@ namespace OpenSim.Grid.UserServer
 
             m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
             m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
-            
 
             m_httpServer.AddStreamHandler(
                 new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod));
@@ -188,7 +187,7 @@ namespace OpenSim.Grid.UserServer
                     tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
 
                     LLUUID userID = new LLUUID();
-                    
+
                     try
                     {
                         userID = m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY);
@@ -199,7 +198,7 @@ namespace OpenSim.Grid.UserServer
                     }
 
                     try
-                    {                        
+                    {
                         if (!m_interServiceInventoryService.CreateNewUserInventory(userID))
                         {
                             throw new Exception(
@@ -245,9 +244,9 @@ namespace OpenSim.Grid.UserServer
                     // requester.ReturnResponseVal = TestResponse;
                     // requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser);
                     SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(
-                        "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser);                
-                    break;     
-                
+                        "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser);
+                    break;
+
                 case "logoff-user":
 
                     if (cmdparams.Length >= 3)
@@ -279,7 +278,7 @@ namespace OpenSim.Grid.UserServer
                                     m_loginService.LogOffUser(theUser, message);
 
                                     theUser.CurrentAgent.AgentOnline = false;
-                                    
+
                                     m_loginService.CommitAgent(ref theUser);
                                 }
                                 else
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 0e61b3c..8488e22 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Grid.UserServer
     public class UserLoginService : LoginService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+
         protected IInterServiceInventoryServices m_inventoryService;
 
         public event UserLoggedInAtLocation OnUserLoggedInAtLocation;
@@ -63,7 +63,7 @@ namespace OpenSim.Grid.UserServer
             m_config = config;
             m_inventoryService = inventoryService;
         }
-        
+
         public override void LogOffUser(UserProfileData theUser, string message)
         {
             RegionProfileData SimInfo = null;
@@ -72,7 +72,7 @@ namespace OpenSim.Grid.UserServer
                 SimInfo = RegionProfileData.RequestSimProfileData(
                                 theUser.CurrentAgent.Handle, m_config.GridServerURL,
                                 m_config.GridSendKey, m_config.GridRecvKey);
-                
+
                 if (SimInfo == null)
                 {
                     m_log.Error("[GRID]: Region user was in isn't currently logged in");
@@ -84,7 +84,7 @@ namespace OpenSim.Grid.UserServer
                 m_log.Error("[GRID]: Unable to look up region to log user off");
                 return;
             }
-            
+
             // Prepare notification
             Hashtable SimParams = new Hashtable();
             SimParams["agent_id"] = theUser.ID.ToString();
@@ -101,7 +101,7 @@ namespace OpenSim.Grid.UserServer
             m_log.InfoFormat(
                 "[ASSUMED CRASH]: Telling region {0} @ {1},{2} ({3}) that their agent is dead: {4}",
                 SimInfo.regionName, SimInfo.regionLocX, SimInfo.regionLocY, SimInfo.httpServerURI, theUser.FirstName + " " + theUser.SurName);
-            
+
             try
             {
                 XmlRpcRequest GridReq = new XmlRpcRequest("logoff_user", SendParams);
@@ -306,8 +306,6 @@ namespace OpenSim.Grid.UserServer
                                 theUser.FirstName, theUser.SurName);
                         }
                     }
-                
-
                 }
             }
             catch (Exception)
@@ -419,7 +417,7 @@ namespace OpenSim.Grid.UserServer
                     else
                     {
                         response.CreateDeadRegionResponse();
-                    }                    
+                    }
                 }
 
                 catch (Exception e)
@@ -432,11 +430,11 @@ namespace OpenSim.Grid.UserServer
 
         // See LoginService
         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);
-            
+
             List<InventoryFolderBase> folders = m_inventoryService.GetInventorySkeleton(userID);
 
             if (null == folders || folders.Count == 0)
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index b1d95da..760dfe3 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -413,7 +413,7 @@ namespace OpenSim.Grid.UserServer
 
             return ProfileToXmlRPCResponse(userProfile);
         }
-        
+
         public XmlRpcResponse XmlRPCGetAgentMethodUUID(XmlRpcRequest request)
         {
             XmlRpcResponse response = new XmlRpcResponse();