Formatting cleanup.

4 files changed, 134 insertions, 134 deletions

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index fb8dcf6..5e7e238 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -95,9 +95,9 @@ namespace OpenSim.Region.Communications.OGS1
         public RegionCommsListener RegisterRegion(RegionInfo regionInfo)
         {
             m_log.InfoFormat(
-                "[OGS1 GRID SERVICES]: Attempting to register region {0} with grid at {1}", 
+                "[OGS1 GRID SERVICES]: Attempting to register region {0} with grid at {1}",
                 regionInfo.RegionName, serversInfo.GridURL);
-            
+
             Hashtable GridParams = new Hashtable();
             // Login / Authentication
 
@@ -122,7 +122,7 @@ namespace OpenSim.Region.Communications.OGS1
             // 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 supply a value from the region's xml file to the grid 
+            // this particular section of the mod attempts to supply a value from the region's xml file to the grid
             // server for the UUID of the region's owner (master avatar)
             GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
 
@@ -139,14 +139,14 @@ namespace OpenSim.Region.Communications.OGS1
             }
             catch (Exception e)
             {
-                Exception e2 
+                Exception e2
                     = new Exception(
                         String.Format("Unable to connect to grid at {0}. Grid service not running?", serversInfo.GridURL),
                         e);
-                
+
                 throw(e2);
             }
-            
+
             Hashtable GridRespData = (Hashtable)GridResp.Value;
             Hashtable griddatahash = GridRespData;
 
@@ -154,9 +154,9 @@ namespace OpenSim.Region.Communications.OGS1
             if (GridRespData.ContainsKey("error"))
             {
                 string errorstring = (string) GridRespData["error"];
-                
+
                 Exception e = new Exception(String.Format("Unable to connect to grid at {0}: {1}", serversInfo.GridURL, errorstring));
-                
+
                 throw e;
             }
             else
@@ -170,9 +170,9 @@ namespace OpenSim.Region.Communications.OGS1
                         m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE");
                     }
                 }
-                
+
                 m_log.InfoFormat(
-                    "[OGS1 GRID SERVICES]: Region {0} successfully registered with grid at {1}", 
+                    "[OGS1 GRID SERVICES]: Region {0} successfully registered with grid at {1}",
                     regionInfo.RegionName, serversInfo.GridURL);
             }
             return m_localBackend.RegisterRegion(regionInfo);
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Communications.OGS1
 
                         string externalIpStr = String.Empty;
                         try
-                        {                            
+                        {
                             externalIpStr = Util.GetHostFromDNS(simIp).ToString();
                         }
                         catch (SocketException e)
@@ -253,16 +253,16 @@ namespace OpenSim.Region.Communications.OGS1
                             m_log.WarnFormat("RequestNeighbours(): Lookup of neighbour {0} failed!  Not including in neighbours list.  {1}", simIp, e);
                             continue;
                         }
-                        
+
                         SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port);
-                        
+
                         sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]);
-                        
+
                         if (neighbourData.ContainsKey("http_port"))
                         {
                             sri.HttpPort = Convert.ToUInt32(neighbourData["http_port"]);
                         }
-                        
+
                         sri.RegionID = new LLUUID((string) neighbourData["uuid"]);
 
                         neighbours.Add(sri);
@@ -274,7 +274,7 @@ namespace OpenSim.Region.Communications.OGS1
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="regionHandle"></param>
         /// <returns></returns>
@@ -309,7 +309,7 @@ namespace OpenSim.Region.Communications.OGS1
 
             regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
             regionInfo.RemotingAddress = internalIpStr;
-            
+
             if (responseData.ContainsKey("http_port"))
             {
                 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]);
@@ -327,7 +327,7 @@ namespace OpenSim.Region.Communications.OGS1
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="regionHandle"></param>
         /// <returns></returns>
@@ -372,7 +372,7 @@ namespace OpenSim.Region.Communications.OGS1
 
                     regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
                     regionInfo.RemotingAddress = internalIpStr;
-                    
+
                     if (responseData.ContainsKey("http_port"))
                     {
                         regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]);
@@ -429,7 +429,7 @@ namespace OpenSim.Region.Communications.OGS1
 
                 regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
                 regionInfo.RemotingAddress = internalIpStr;
-                
+
                 if (responseData.ContainsKey("http_port"))
                 {
                     regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]);
@@ -451,7 +451,7 @@ namespace OpenSim.Region.Communications.OGS1
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="minX"></param>
         /// <param name="minY"></param>
@@ -601,7 +601,7 @@ namespace OpenSim.Region.Communications.OGS1
         #region m_interRegion Comms
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         private void StartRemoting()
         {
@@ -688,55 +688,55 @@ namespace OpenSim.Region.Communications.OGS1
                 catch (RemotingException e)
                 {
                     NoteDeadRegion(regionHandle);
-                
+
                     m_log.WarnFormat(
                         "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
                         regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
                     m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
-                
+
                     return false;
                 }
                 catch (SocketException e)
                 {
                     NoteDeadRegion(regionHandle);
-                
+
                     m_log.WarnFormat(
                         "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
                         regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
                     m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
-                
+
                     return false;
                 }
                 catch (InvalidCredentialException e)
                 {
                     NoteDeadRegion(regionHandle);
-                
+
                     m_log.WarnFormat(
                         "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
                         regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
                     m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
-                
+
                     return false;
                 }
                 catch (AuthenticationException e)
                 {
                     NoteDeadRegion(regionHandle);
-                
+
                     m_log.WarnFormat(
                         "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
                         regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
                     m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
-                
+
                     return false;
                 }
                 catch (Exception e)
                 {
                     NoteDeadRegion(regionHandle);
-                
+
                     m_log.WarnFormat("[OGS1 GRID SERVICES]: Unable to connect to adjacent region: {0} {1},{2}",
                                      regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
                     m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
-                
+
                     return false;
                 }
             }
@@ -748,7 +748,7 @@ namespace OpenSim.Region.Communications.OGS1
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="regionHandle"></param>
         /// <param name="agentData"></param>
@@ -797,56 +797,56 @@ namespace OpenSim.Region.Communications.OGS1
             catch (RemotingException e)
             {
                 NoteDeadRegion(regionHandle);
-                
+
                 m_log.WarnFormat(
                     "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
                     regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
                 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
-                
+
                 return false;
             }
             catch (SocketException e)
             {
                 NoteDeadRegion(regionHandle);
-                
+
                 m_log.WarnFormat(
                     "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
                     regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
                 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
-                
+
                 return false;
             }
             catch (InvalidCredentialException e)
             {
                 NoteDeadRegion(regionHandle);
-                
+
                 m_log.WarnFormat(
                     "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
                     regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
                 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
-                
+
                 return false;
             }
             catch (AuthenticationException e)
             {
                 NoteDeadRegion(regionHandle);
-                
+
                 m_log.WarnFormat(
                     "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
                     regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
                 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
-                
+
                 return false;
             }
             catch (Exception e)
             {
                 NoteDeadRegion(regionHandle);
-                
+
                 m_log.WarnFormat(
                     "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
                     regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
                 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
-                
+
                 return false;
             }
         }
@@ -857,17 +857,17 @@ namespace OpenSim.Region.Communications.OGS1
             SerializableRegionInfo regInfo = null;
             try
             {
-                // You may ask why this is in here...   
-                // The region asking the grid services about itself..  
-                // And, surprisingly, the reason is..  it doesn't know 
+                // You may ask why this is in here...
+                // The region asking the grid services about itself..
+                // And, surprisingly, the reason is..  it doesn't know
                 // it's own remoting port!  How special.
                 RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port);
 
                 region = new SerializableRegionInfo(RequestNeighbourInfo(region.RegionHandle));
-                region.RemotingAddress = region.ExternalHostName;                  
-                region.RemotingPort = NetworkServersInfo.RemotingListenerPort;                
+                region.RemotingAddress = region.ExternalHostName;
+                region.RemotingPort = NetworkServersInfo.RemotingListenerPort;
                 region.HttpPort = serversInfo.HttpListenerPort;
-                    
+
                 if (m_localBackend.RegionUp(region, regionhandle))
                 {
                     return true;
@@ -904,7 +904,7 @@ namespace OpenSim.Region.Communications.OGS1
                     }
                     else
                     {
-                        // We're trying to inform ourselves via remoting. 
+                        // We're trying to inform ourselves via remoting.
                         // This is here because we're looping over the listeners before we get here.
                         // Odd but it should work.
                         return true;
@@ -963,7 +963,7 @@ namespace OpenSim.Region.Communications.OGS1
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="regionHandle"></param>
         /// <param name="agentData"></param>
@@ -1058,7 +1058,7 @@ namespace OpenSim.Region.Communications.OGS1
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="regionHandle"></param>
         /// <param name="agentID"></param>
@@ -1098,20 +1098,20 @@ namespace OpenSim.Region.Communications.OGS1
 
                     return retValue;
                 }
-                //TODO need to see if we know about where this region is and use .net remoting 
-                // to inform it. 
+                //TODO need to see if we know about where this region is and use .net remoting
+                // to inform it.
                 NoteDeadRegion(regionHandle);
                 return false;
             }
             catch (RemotingException e)
             {
                 NoteDeadRegion(regionHandle);
-                
+
                 m_log.WarnFormat(
                     "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
                     regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
                 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
-                
+
                 return false;
             }
             catch
@@ -1155,8 +1155,8 @@ namespace OpenSim.Region.Communications.OGS1
 
                     return retValue;
                 }
-                //TODO need to see if we know about where this region is and use .net remoting 
-                // to inform it. 
+                //TODO need to see if we know about where this region is and use .net remoting
+                // to inform it.
                 NoteDeadRegion(regionHandle);
                 return false;
             }
@@ -1184,7 +1184,7 @@ namespace OpenSim.Region.Communications.OGS1
             catch (AuthenticationException e)
             {
                 NoteDeadRegion(regionHandle);
-                m_log.Warn("[OGS1 GRID SERVICES]: Authentication exception: Unable to connect to adjacent region: " + regionHandle);                         
+                m_log.Warn("[OGS1 GRID SERVICES]: Authentication exception: Unable to connect to adjacent region: " + regionHandle);
                 m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message);
                 return false;
             }
@@ -1230,8 +1230,8 @@ namespace OpenSim.Region.Communications.OGS1
 
                     return true;
                 }
-                //TODO need to see if we know about where this region is and use .net remoting 
-                // to inform it. 
+                //TODO need to see if we know about where this region is and use .net remoting
+                // to inform it.
                 NoteDeadRegion(regionHandle);
                 return false;
             }
@@ -1311,7 +1311,7 @@ namespace OpenSim.Region.Communications.OGS1
         #region Methods triggered by calls from external instances
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="regionHandle"></param>
         /// <param name="agentData"></param>
@@ -1342,7 +1342,7 @@ namespace OpenSim.Region.Communications.OGS1
             nRegionInfo.RegionLocX = regionData.X;
             nRegionInfo.RegionLocY = regionData.Y;
 
-            
+
             try
             {
                 lock (m_deadRegionCache)
@@ -1379,14 +1379,14 @@ namespace OpenSim.Region.Communications.OGS1
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="regionHandle"></param>
         /// <param name="agentData"></param>
         /// <returns></returns>
         public bool IncomingPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod)
         {
-            // Is this necessary?   
+            // Is this necessary?
             try
             {
                 m_localBackend.TriggerExpectPrim(regionHandle, primID, objData, XMLMethod);
@@ -1401,7 +1401,7 @@ namespace OpenSim.Region.Communications.OGS1
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="regionHandle"></param>
         /// <param name="agentID"></param>
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 0f75a09..9b3d878 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -41,11 +41,11 @@ namespace OpenSim.Region.Communications.OGS1
 {
     public class OGS1InventoryService : IInventoryServices
     {
-        private static readonly ILog m_log 
+        private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private string _inventoryServerUrl;
-        private Dictionary<LLUUID, InventoryReceiptCallback> m_RequestingInventory 
+        private Dictionary<LLUUID, InventoryReceiptCallback> m_RequestingInventory
             = new Dictionary<LLUUID, InventoryReceiptCallback>();
 
         public OGS1InventoryService(string inventoryServerUrl)
@@ -65,26 +65,26 @@ namespace OpenSim.Region.Communications.OGS1
             if (!m_RequestingInventory.ContainsKey(userID))
             {
                 m_RequestingInventory.Add(userID, callback);
-                
+
                 try
                 {
                     m_log.InfoFormat(
                         "[OGS1 INVENTORY SERVICE]: Requesting inventory from {0}/GetInventory/ for user {1}",
                         _inventoryServerUrl, userID);
-    
+
                     RestObjectPosterResponse<InventoryCollection> requester
                         = new RestObjectPosterResponse<InventoryCollection>();
                     requester.ResponseCallback = InventoryResponse;
-    
+
                     requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID);
                 }
                 catch (WebException e)
                 {
                     if (StatsManager.SimExtraStats != null)
                         StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure();
-                    
-                    m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}", 
-                        e.Source, e.Message);                        
+
+                    m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Request inventory operation failed, {0} {1}",
+                        e.Source, e.Message);
                 }
             }
             else
@@ -92,11 +92,11 @@ namespace OpenSim.Region.Communications.OGS1
                 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: RequestInventoryForUser() - could you not find user profile for {0}", userID);
             }
         }
-         
+
         /// <summary>
         /// Callback used by the inventory server GetInventory request
         /// </summary>
-        /// <param name="userID"></param>        
+        /// <param name="userID"></param>
         private void InventoryResponse(InventoryCollection response)
         {
             LLUUID userID = response.UserID;
@@ -108,17 +108,17 @@ namespace OpenSim.Region.Communications.OGS1
 
                 InventoryFolderImpl rootFolder = null;
                 InventoryReceiptCallback callback = m_RequestingInventory[userID];
-                
+
                 ICollection<InventoryFolderImpl> folders = new List<InventoryFolderImpl>();
                 ICollection<InventoryItemBase> items = new List<InventoryItemBase>();
-                
+
                 foreach (InventoryFolderBase folder in response.Folders)
                 {
                     if (folder.ParentID == LLUUID.Zero)
                     {
                         rootFolder = new InventoryFolderImpl(folder);
                         folders.Add(rootFolder);
-                        
+
                         break;
                     }
                 }
@@ -142,9 +142,9 @@ namespace OpenSim.Region.Communications.OGS1
                 {
                     m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Did not get back an inventory containing a root folder for user {0}", userID);
                 }
-                
+
                 callback(folders, items);
-                
+
                 m_RequestingInventory.Remove(userID);
             }
             else
@@ -158,7 +158,7 @@ namespace OpenSim.Region.Communications.OGS1
 
         /// <summary>
         /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
-        /// </summary>      
+        /// </summary>
         public bool AddFolder(InventoryFolderBase folder)
         {
             try
@@ -168,68 +168,68 @@ namespace OpenSim.Region.Communications.OGS1
             }
             catch (WebException e)
             {
-                m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory folder operation failed, {0} {1}", 
+                m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory folder operation failed, {0} {1}",
                      e.Source, e.Message);
             }
-            
+
             return false;
         }
 
         /// <summary>
         /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
         /// </summary>
-        /// <param name="folder"></param>        
+        /// <param name="folder"></param>
         public bool MoveFolder(InventoryFolderBase folder)
         {
             try
-            {            
+            {
                 return SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
                     "POST", _inventoryServerUrl + "/MoveFolder/", folder);
             }
             catch (WebException e)
             {
-                m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", 
+                m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}",
                      e.Source, e.Message);
-            }                
-            
+            }
+
             return false;
         }
-        
+
         /// <summary>
         /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
         /// </summary>
         public bool PurgeFolder(InventoryFolderBase folder)
         {
             try
-            {            
+            {
                 return SynchronousRestObjectPoster.BeginPostObject<InventoryFolderBase, bool>(
                     "POST", _inventoryServerUrl + "/PurgeFolder/", folder);
             }
             catch (WebException e)
             {
-                m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}", 
+                m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Move inventory folder operation failed, {0} {1}",
                      e.Source, e.Message);
-            }    
-            
+            }
+
             return false;
-        }        
+        }
 
         /// <summary>
         /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
-        /// </summary>      
+        /// </summary>
         public bool AddItem(InventoryItemBase item)
         {
             try
-            {                
+            {
                 return SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
                     "POST", _inventoryServerUrl + "/NewItem/", item);
             }
             catch (WebException e)
             {
-                m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}", 
+                m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Add new inventory item operation failed, {0} {1}",
                      e.Source, e.Message);
-            }              
-            
+            }
+
             return false;
         }
 
@@ -246,26 +246,26 @@ namespace OpenSim.Region.Communications.OGS1
                 m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Update new inventory item operation failed, {0} {1}",
                      e.Source, e.Message);
             }
-            
+
             return false;
         }
 
         /// <summary>
         /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
-        /// </summary>       
+        /// </summary>
         public bool DeleteItem(InventoryItemBase item)
         {
             try
-            {                    
+            {
                 return SynchronousRestObjectPoster.BeginPostObject<InventoryItemBase, bool>(
                     "POST", _inventoryServerUrl + "/DeleteItem/", item);
             }
             catch (WebException e)
             {
-                m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Delete inventory item operation failed, {0} {1}", 
+                m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: Delete inventory item operation failed, {0} {1}",
                      e.Source, e.Message);
-            }                
-            
+            }
+
             return false;
         }
 
@@ -283,12 +283,12 @@ namespace OpenSim.Region.Communications.OGS1
         {
             return false;
         }
-        
+
         // See IInventoryServices
         public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId)
         {
             m_log.ErrorFormat("[OGS1 INVENTORY SERVICE]: The GetInventorySkeleton() method here should never be called!");
-            
+
             return new List<InventoryFolderBase>();
         }
 
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index e3ee2c1..63fad4a 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -117,8 +117,8 @@ namespace OpenSim.Region.Communications.OGS1
         {
             List<FriendListItem> buddylist = new List<FriendListItem>();
             int buddycount = Convert.ToInt32((string)data["avcount"]);
-            
-            
+
+
             for (int i = 0; i < buddycount; i++)
             {
                 FriendListItem buddylistitem = new FriendListItem();
@@ -130,8 +130,8 @@ namespace OpenSim.Region.Communications.OGS1
 
                 buddylist.Add(buddylistitem);
             }
-            
-            
+
+
             return buddylist;
         }
 
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Communications.OGS1
         /// Get a user profile from the user server
         /// </summary>
         /// <param name="avatarID"></param>
-        /// <returns>null if the request fails</returns>        
+        /// <returns>null if the request fails</returns>
         public UserProfileData GetUserProfile(string name)
         {
             try
@@ -222,7 +222,7 @@ namespace OpenSim.Region.Communications.OGS1
                     "[OGS1 USER SERVICES]: Error when trying to fetch profile data by name from remote user server: {0}",
                     e);
             }
-            
+
             return null;
         }
 
@@ -251,7 +251,7 @@ namespace OpenSim.Region.Communications.OGS1
                     "[OGS1 USER SERVICES]: Error when trying to fetch profile data by uuid from remote user server: {0}",
                     e);
             }
-            
+
             return null;
         }
 
@@ -264,7 +264,7 @@ namespace OpenSim.Region.Communications.OGS1
         /// Retrieve the user information for the given master uuid.
         /// </summary>
         /// <param name="uuid"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         public UserProfileData SetupMasterUser(string firstName, string lastName)
         {
             return SetupMasterUser(firstName, lastName, String.Empty);
@@ -274,7 +274,7 @@ namespace OpenSim.Region.Communications.OGS1
         /// Retrieve the user information for the given master uuid.
         /// </summary>
         /// <param name="uuid"></param>
-        /// <returns></returns>        
+        /// <returns></returns>
         public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
         {
             UserProfileData profile = GetUserProfile(firstName, lastName);
@@ -289,13 +289,13 @@ namespace OpenSim.Region.Communications.OGS1
         public UserProfileData SetupMasterUser(LLUUID uuid)
         {
             UserProfileData data = GetUserProfile(uuid);
-            
+
             if (data == null)
             {
                 throw new Exception(
                     "Could not retrieve profile for master user " + uuid + ".  User server did not respond to the request.");
             }
-            
+
             return data;
         }
 
@@ -405,9 +405,9 @@ namespace OpenSim.Region.Communications.OGS1
             {
                 m_log.Warn("[GRID]: Error when trying to AddNewUserFriend: " +
                            e.Message);
-                
+
             }
-            
+
         }
 
         /// <summary>
@@ -422,7 +422,7 @@ namespace OpenSim.Region.Communications.OGS1
                 Hashtable param = new Hashtable();
                 param["ownerID"] = friendlistowner.UUID.ToString();
                 param["friendID"] = friend.UUID.ToString();
-                
+
 
                 IList parameters = new ArrayList();
                 parameters.Add(param);
@@ -458,7 +458,7 @@ namespace OpenSim.Region.Communications.OGS1
             {
                 m_log.Warn("[GRID]: Error when trying to RemoveUserFriend: " +
                            e.Message);
-                
+
             }
         }
 
@@ -519,7 +519,7 @@ namespace OpenSim.Region.Communications.OGS1
         public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner)
         {
             List<FriendListItem> buddylist = new List<FriendListItem>();
-            
+
             try
             {
                 Hashtable param = new Hashtable();
@@ -531,11 +531,11 @@ namespace OpenSim.Region.Communications.OGS1
                 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 8000);
                 Hashtable respData = (Hashtable) resp.Value;
 
-                if (respData.Contains("avcount")) 
+                if (respData.Contains("avcount"))
                 {
                     buddylist = ConvertXMLRPCDataToFriendListItemList(respData);
                 }
-                
+
             }
             catch (WebException e)
             {
@@ -550,7 +550,7 @@ namespace OpenSim.Region.Communications.OGS1
 
         /// Appearance
         /// TODO: stubs for now to get us to a compiling state gently
-        public AvatarAppearance GetUserAppearance(LLUUID user) 
+        public AvatarAppearance GetUserAppearance(LLUUID user)
         {
             return new AvatarAppearance();
         }
@@ -564,12 +564,12 @@ namespace OpenSim.Region.Communications.OGS1
         {
             return;
         }
-        
+
         public void RemoveAttachment(LLUUID user, LLUUID item)
         {
             return;
         }
-        
+
         public List<LLUUID> GetAttachments(LLUUID user)
         {
             return new List<LLUUID>();
diff --git a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
index 964180a..c15c604 100644
--- a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/OGS1/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")]