4 files changed, 73 insertions, 73 deletions

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 4df6415..59ac161 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -95,7 +95,7 @@ namespace OpenSim
         }
 
         private static bool _IsHandlingException = false; // Make sure we don't go recursive on ourself
-        
+
         /// <summary>
         /// Global exception handler -- all unhandlet exceptions end up here :)
         /// </summary>
diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index 2e3122f..4fd93e8 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -33,7 +33,7 @@ namespace OpenSim
     {
         void Initialise(OpenSimBase openSim);
     }
-    
+
     public class ApplicationPluginInitialiser : PluginInitialiserBase
     {
         private OpenSimBase server;
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 4664b0b..cc2d993 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -90,8 +90,8 @@ namespace OpenSim
             m_log.InfoFormat("[OPENSIM MAIN]: Running in {0} mode", (m_sandbox ? "sandbox" : "grid"));
 
             m_console = new ConsoleBase("Region", this);
-            MainConsole.Instance = m_console;            
-            
+            MainConsole.Instance = m_console;
+
             base.Startup();
 
             //Run Startup Commands
@@ -116,9 +116,9 @@ namespace OpenSim
             PrintFileToConsole("startuplogo.txt");
             RegisterCmd("echoTest", RunEchoTest, "this echos your command args to see how they are parsed");
             RegisterCmd("kickuser", KickUserCommand, "kickuser [first] [last] - attempts to log off a user from any region we are serving");
-            
+
             // For now, start at the 'root' level by default
-            ChangeSelectedRegion(new string[] {"root"});            
+            ChangeSelectedRegion(new string[] {"root"});
         }
 
         private void RunAutoTimerScript(object sender, EventArgs e)
@@ -135,7 +135,7 @@ namespace OpenSim
         {
             for (int i = 0; i < cmdparams.Length; i++)
             {
-                m_log.Info("[EchoTest]:  <arg" + i + ">"+cmdparams[i]+"</arg" + i + ">"); 
+                m_log.Info("[EchoTest]:  <arg" + i + ">"+cmdparams[i]+"</arg" + i + ">");
             }
         }
 
@@ -214,7 +214,7 @@ namespace OpenSim
         {
             base.RunCmd(command, cmdparams);
             RunPluginCommands(command , cmdparams);
-            
+
             switch (command)
             {
                 case "clear-assets":
@@ -255,7 +255,7 @@ namespace OpenSim
                     m_console.Notice("  debug scene [scripting] [collision] [physics] - Enable/Disable debug stuff, each can be True/False");
                     m_console.Notice("edit-scale [prim name] [x] [y] [z] - resize given prim");
                     m_console.Notice("export-map [filename] - save image of world map");
-                    m_console.Notice("force-update - force an update of prims in the scene");                                        
+                    m_console.Notice("force-update - force an update of prims in the scene");
                     m_console.Notice("restart - disconnects all clients and restarts the sims in the instance.");
                     m_console.Notice("remove-region [name] - remove a region");
                     m_console.Notice("load-xml [filename] - load prims from XML (DEPRECATED)");
@@ -273,14 +273,14 @@ namespace OpenSim
                     m_console.Notice("config set section field value - set a config value");
                     m_console.Notice("config get section field - get a config value");
                     m_console.Notice("config save - save OpenSim.ini");
-                    m_console.Notice("terrain help - show help for terrain commands.");                    
+                    m_console.Notice("terrain help - show help for terrain commands.");
                     ShowPluginCommandsHelp(CombineParams(cmdparams, 0), m_console);
-                    
+
                     if (m_sandbox)
                     {
                         m_console.Notice("");
                         m_console.Notice("create user - adds a new user.");
-                    }                    
+                    }
 
                     break;
 
@@ -314,11 +314,11 @@ namespace OpenSim
                 case "load-oar":
                     LoadOar(cmdparams);
                     break;
-                    
+
                 case "save-oar":
                     SaveOar(cmdparams);
                     break;
-                    
+
                 case "save-inv":
                     SaveInv(cmdparams);
                     break;
@@ -343,13 +343,13 @@ namespace OpenSim
                     break;
 
                 case "create":
-                    Create(cmdparams);                    
+                    Create(cmdparams);
                     break;
 
                 case "create-region":
                     CreateRegion(new RegionInfo(cmdparams[0], "Regions/" + cmdparams[1],false), true);
                     break;
-                
+
                 case "remove-region":
                     string regName = CombineParams(cmdparams, 0);
 
@@ -441,7 +441,7 @@ namespace OpenSim
                         }
                     }
                     break;
-                
+
                 case "modules":
                     if (cmdparams.Length > 0)
                     {
@@ -488,7 +488,7 @@ namespace OpenSim
                         m_commsManager.AddInventoryService(cmdparams[0]);
                     }
                     break;
-                
+
                 default:
                     string[] tmpPluginArgs = new string[cmdparams.Length + 1];
                     cmdparams.CopyTo(tmpPluginArgs, 1);
@@ -498,7 +498,7 @@ namespace OpenSim
                     break;
             }
         }
-        
+
         /// <summary>
         /// Change the currently selected region.  The selected region is that operated upon by single region commands.
         /// </summary>
@@ -515,13 +515,13 @@ namespace OpenSim
             else
             {
                 m_console.Error("Usage: change-region <region name>");
-            }   
+            }
 
-            string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName);                               
+            string regionName = (m_sceneManager.CurrentScene == null ? "root" : m_sceneManager.CurrentScene.RegionInfo.RegionName);
             m_console.Notice(String.Format("Currently selected region is {0}", regionName));
-            m_console.DefaultPrompt = String.Format("Region ({0}) ", regionName);                                 
+            m_console.DefaultPrompt = String.Format("Region ({0}) ", regionName);
         }
-        
+
         /// <summary>
         /// Execute switch for some of the create commands
         /// </summary>
@@ -530,7 +530,7 @@ namespace OpenSim
         {
             if (args.Length == 0)
                 return;
-            
+
             switch (args[0])
             {
                 case "user":
@@ -547,7 +547,7 @@ namespace OpenSim
         {
             if (args.Length == 0)
                 return;
-          
+
             switch (args[0])
             {
                 case "packet":
@@ -566,7 +566,7 @@ namespace OpenSim
                     }
 
                     break;
-                
+
                 case "scene":
                     if (args.Length == 4)
                     {
@@ -580,11 +580,11 @@ namespace OpenSim
                             bool collisionsOn = !Convert.ToBoolean(args[2]);
                             bool physicsOn = !Convert.ToBoolean(args[3]);
                             m_sceneManager.CurrentScene.SetSceneCoreDebug(scriptingOn, collisionsOn, physicsOn);
-                        
+
                             m_console.Notice(
-                                "CONSOLE", 
+                                "CONSOLE",
                                 String.Format(
-                                    "Set debug scene scripting = {0}, collisions = {1}, physics = {2}", 
+                                    "Set debug scene scripting = {0}, collisions = {1}, physics = {2}",
                                     !scriptingOn, !collisionsOn, !physicsOn));
                         }
                     }
@@ -592,9 +592,9 @@ namespace OpenSim
                     {
                         m_console.Error("debug scene <scripting> <collisions> <physics> (where inside <> is true/false)");
                     }
-               
-                    break;                
-                
+
+                    break;
+
                 default:
                     m_console.Error("Unknown debug");
                     break;
@@ -666,7 +666,7 @@ namespace OpenSim
                     break;
             }
         }
-        
+
         /// <summary>
         /// Create a new user
         /// </summary>
@@ -697,7 +697,7 @@ namespace OpenSim
 
             if ( cmdparams.Length < 6 )
                 regY = Convert.ToUInt32(MainConsole.Instance.CmdPrompt("Start Region Y", regY.ToString()));
-            else regY = Convert.ToUInt32(cmdparams[5]);        
+            else regY = Convert.ToUInt32(cmdparams[5]);
 
             if (null == m_commsManager.UserService.GetUserProfile(firstName, lastName))
             {
@@ -706,9 +706,9 @@ namespace OpenSim
             else
             {
                 m_log.ErrorFormat("[CONSOLE]: A user with the name {0} {1} already exists!", firstName, lastName);
-            }            
+            }
         }
-        
+
         protected void SaveXml(string[] cmdparams)
         {
             m_log.Error("[CONSOLE]: PLEASE NOTE, save-xml is DEPRECATED and may be REMOVED soon.  If you are using this and there is some reason you can't use save-xml2, please file a mantis detailing the reason.");
@@ -721,8 +721,8 @@ namespace OpenSim
             {
                 m_sceneManager.SaveCurrentSceneToXml(DEFAULT_PRIM_BACKUP_FILENAME);
             }
-        }            
-        
+        }
+
         protected void LoadXml(string[] cmdparams)
         {
             m_log.Error("[CONSOLE]: PLEASE NOTE, load-xml is DEPRECATED and may be REMOVED soon.  If you are using this and there is some reason you can't use load-xml2, please file a mantis detailing the reason.");
@@ -758,8 +758,8 @@ namespace OpenSim
             {
                 m_sceneManager.LoadCurrentSceneFromXml(DEFAULT_PRIM_BACKUP_FILENAME, false, loadOffset);
             }
-        }           
-        
+        }
+
         protected void SaveXml2(string[] cmdparams)
         {
             if (cmdparams.Length > 0)
@@ -771,7 +771,7 @@ namespace OpenSim
                 m_sceneManager.SaveCurrentSceneToXml2(DEFAULT_PRIM_BACKUP_FILENAME);
             }
         }
-        
+
         protected void LoadXml2(string[] cmdparams)
         {
             if (cmdparams.Length > 0)
@@ -782,8 +782,8 @@ namespace OpenSim
             {
                 m_sceneManager.LoadCurrentSceneFromXml2(DEFAULT_PRIM_BACKUP_FILENAME);
             }
-        }           
-        
+        }
+
         /// <summary>
         /// Load a whole region from an opensim archive.
         /// </summary>
@@ -800,9 +800,9 @@ namespace OpenSim
             else
             {
                 m_sceneManager.LoadArchiveToCurrentScene(DEFAULT_OAR_BACKUP_FILENAME);
-            }            
+            }
         }
-        
+
         /// <summary>
         /// Save a region to a file, including all the assets needed to restore it.
         /// </summary>
@@ -819,8 +819,8 @@ namespace OpenSim
             else
             {
                 m_sceneManager.SaveCurrentSceneToArchive(DEFAULT_OAR_BACKUP_FILENAME);
-            }           
-        }              
+            }
+        }
 
         private static string CombineParams(string[] commandParams, int pos)
         {
@@ -835,7 +835,7 @@ namespace OpenSim
 
         /// <summary>
         /// Runs the best matching plugin command
-        /// 
+        ///
         /// returns true if a match was found, false otherwise.
         /// </summary>
         public bool RunPluginCommands(string cmd, string[] withParams)
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 0ac8cd7..983773a 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -70,7 +70,7 @@ namespace OpenSim
         /// The file used to load and save an opensim archive if no filename has been specified
         /// </summary>
         protected const string DEFAULT_OAR_BACKUP_FILENAME = "scene_oar.tar.gz";
-        
+
         /// <summary>
         /// The file to load and save inventory if no filename has been specified
         /// </summary>
@@ -161,7 +161,7 @@ namespace OpenSim
             m_config = new OpenSimConfigSource();
             m_config.Source = new IniConfigSource();
             // IConfigSource icong;
-            
+
             //check for .INI file (either default or name passed in command line)
             if (File.Exists(Application.iniFilePath))
             {
@@ -338,7 +338,7 @@ namespace OpenSim
 
         protected void LoadPlugins()
         {
-            PluginLoader<IApplicationPlugin> loader = 
+            PluginLoader<IApplicationPlugin> loader =
                 new PluginLoader<IApplicationPlugin> (new ApplicationPluginInitialiser (this));
 
             loader.Load ("/OpenSim/Startup");
@@ -351,7 +351,7 @@ namespace OpenSim
         public override void Startup()
         {
             base.Startup();
-            
+
             m_stats = StatsManager.StartCollectingSimExtraStats();
 
             // StandAlone mode? m_sandbox is determined by !startupConfig.GetBoolean("gridmode", false)
@@ -586,7 +586,7 @@ namespace OpenSim
         public void handleRestartRegion(RegionInfo whichRegion)
         {
             m_log.Error("[OPENSIM MAIN]: Got restart signal from SceneManager");
-            
+
             // Shutting down the client server
             bool foundClientServer = false;
             int clientServerElement = 0;
@@ -660,7 +660,7 @@ namespace OpenSim
         }
 
         #endregion
-        
+
         /// <summary>
         /// Save inventory to a file.
         /// </summary>
@@ -668,49 +668,49 @@ namespace OpenSim
         protected void SaveInv(string[] cmdparams)
         {
             m_log.Error("[CONSOLE]: This command has not yet been implemented!");
-            
+
             if (cmdparams.Length < 3)
             {
                 m_log.Error("[CONSOLE]: usage is save-inv <first name> <last name> <inventory path> [<save file path>]");
                 return;
             }
-            
-            string firstName = cmdparams[0];            
+
+            string firstName = cmdparams[0];
             string lastName = cmdparams[1];
             string invPath = cmdparams[2];
             //string savePath = (cmdparams.Length > 3 ? cmdparams[3] : DEFAULT_INV_BACKUP_FILENAME);
-            
+
             UserProfileData userProfile = m_commsManager.UserService.GetUserProfile(firstName, lastName);
             if (null == userProfile)
             {
                 m_log.ErrorFormat("[CONSOLE]: Failed to find user {0} {1}", firstName, lastName);
                 return;
-            }            
-            
+            }
+
             CachedUserInfo userInfo = m_commsManager.UserProfileCacheService.GetUserDetails(userProfile.ID);
             if (null == userInfo)
             {
                 m_log.ErrorFormat("[CONSOLE]: Failed to find user info for {0} {1} {2}", firstName, lastName, userProfile.ID);
                 return;
-            }       
-            
+            }
+
             InventoryFolderImpl inventoryFolder = null;
             InventoryItemBase inventoryItem = null;
-            
+
             if (userInfo.HasReceivedInventory)
             {
                 // Eliminate double slashes and any leading / on the path.  This might be better done within InventoryFolderImpl
                 // itself (possibly at a small loss in efficiency).
-                string[] components 
+                string[] components
                     = invPath.Split(new string[] { InventoryFolderImpl.PATH_DELIMITER }, StringSplitOptions.RemoveEmptyEntries);
                 invPath = String.Empty;
                 foreach (string c in components)
                 {
                     invPath += c + InventoryFolderImpl.PATH_DELIMITER;
-                }                    
-                
+                }
+
                 invPath = invPath.Remove(invPath.LastIndexOf(InventoryFolderImpl.PATH_DELIMITER));
-                
+
                 // Annoyingly Split actually returns the original string if the input string consists only of delimiters
                 // Therefore if we still start with a / after the split, then we need the root folder
                 if (invPath.StartsWith(InventoryFolderImpl.PATH_DELIMITER))
@@ -718,10 +718,10 @@ namespace OpenSim
                     inventoryFolder = userInfo.RootFolder;
                 }
                 else
-                {                        
-                    inventoryFolder = userInfo.RootFolder.FindFolderByPath(invPath);   
+                {
+                    inventoryFolder = userInfo.RootFolder.FindFolderByPath(invPath);
                 }
-                
+
                 // The path may point to an item instead
                 if (inventoryFolder == null)
                 {
@@ -733,7 +733,7 @@ namespace OpenSim
                 m_log.ErrorFormat("[CONSOLE]: Have not yet received inventory info for user {0} {1} {2}", firstName, lastName, userProfile.ID);
                 return;
             }
-            
+
             if (null != inventoryFolder)
             {
                 m_log.InfoFormat("[CONSOLE]: Found folder {0} {1} at {2}", inventoryFolder.Name, inventoryFolder.ID, invPath);
@@ -746,8 +746,8 @@ namespace OpenSim
             {
                 m_log.ErrorFormat("[CONSOLE]: Could not find inventory entry at path {0}", invPath);
                 return;
-            }            
-        }        
+            }
+        }
 
         /// <summary>
         /// Performs any last-minute sanity checking and shuts down the region server