Merge branch 'master' into vehicles

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 912cbf1..88ace6a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2332,7 +2332,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return itemBlock;
         }
         
-        public void SendBulkUpdateInventory(InventoryNodeBase node)        
+        public void SendBulkUpdateInventory(InventoryNodeBase node)
         {
             if (node is InventoryItemBase)
                 SendBulkUpdateInventoryItem((InventoryItemBase)node);
@@ -2937,7 +2937,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 else if (m_avatarTerseUpdates.Count == 1)
                 {
                     lock (m_avatarTerseUpdateTimer)
-                        m_avatarTerseUpdateTimer.Start();                
+                        m_avatarTerseUpdateTimer.Start();
                 }
             }
         }