From 3bf88587277b83c0b6f058fabba7d46a3b5a6a00 Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Thu, 28 Aug 2008 14:41:54 +0000
Subject: Update svn properties, formatting cleanup.

---
 OpenSim/Framework/AgentCircuitManager.cs           |  6 +++---
 .../Communications/Cache/CachedUserInfo.cs         |  2 +-
 .../Cache/UserProfileCacheService.cs               |  2 +-
 .../Framework/Communications/Capabilities/Caps.cs  |  4 ++--
 .../Framework/Communications/GridInfoService.cs    | 14 ++++++-------
 OpenSim/Framework/IClientAPI.cs                    |  6 +++---
 OpenSim/Framework/Servers/BaseHttpServer.cs        | 24 +++++++++++-----------
 OpenSim/Framework/Servers/BaseOpenSimServer.cs     | 18 ++++++++--------
 8 files changed, 38 insertions(+), 38 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
index 80e2f87..a235688 100644
--- a/OpenSim/Framework/AgentCircuitManager.cs
+++ b/OpenSim/Framework/AgentCircuitManager.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Framework
             }
         }
 
-        
+
         /// <summary>
         /// Sometimes the circuitcode may not be known before setting up the connection
         /// </summary>
@@ -126,7 +126,7 @@ namespace OpenSim.Framework
                 if (AgentCircuits.ContainsKey((uint)circuitcode) && !AgentCircuits.ContainsKey((uint)newcircuitcode))
                 {
                     AgentCircuitData agentData = AgentCircuits[(uint)circuitcode];
-                    
+
                     agentData.circuitcode = newcircuitcode;
 
                     AgentCircuits.Remove((uint)circuitcode);
@@ -155,4 +155,4 @@ namespace OpenSim.Framework
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 17f927d..3a20b9e 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -306,7 +306,7 @@ namespace OpenSim.Framework.Communications.Cache
             //                "[INVENTORY CACHE]: Received item {0} {1} for user {2}",
             //                itemInfo.Name, itemInfo.ID, userID);
             InventoryFolderImpl folder = null;
-            
+
             if ( RootFolder != null )
                 folder = RootFolder.FindFolder(itemInfo.Folder);
 
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index 017cb29..45f6c7e 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Framework.Communications.Cache
         {
             if (userID == LLUUID.Zero)
                 return;
-            
+
             lock (m_userProfiles)
             {
                 if (m_userProfiles.ContainsKey(userID))
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 18ddd9e..a7486d6 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -617,9 +617,9 @@ namespace OpenSim.Framework.Communications.Capabilities
 
                 IMoneyModule mm = scene.RequestModuleInterface<IMoneyModule>();
 
-                if(mm != null)
+                if (mm != null)
                 {
-                    if(!mm.UploadCovered(client))
+                    if (!mm.UploadCovered(client))
                     {
                         client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
 
diff --git a/OpenSim/Framework/Communications/GridInfoService.cs b/OpenSim/Framework/Communications/GridInfoService.cs
index ce66c82..bd108c1 100644
--- a/OpenSim/Framework/Communications/GridInfoService.cs
+++ b/OpenSim/Framework/Communications/GridInfoService.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications
         /// GridInfoService uses the [GridInfo] section of the
         /// standard OpenSim.ini file --- which is not optimal, but
         /// anything else requires a general redesign of the config
-        /// system. 
+        /// system.
         /// </remarks>
         public GridInfoService(IConfigSource configSource)
         {
@@ -65,7 +65,7 @@ namespace OpenSim.Framework.Communications
         /// </summary>
         public GridInfoService()
         {
-            try 
+            try
             {
                 IConfigSource configSource = new IniConfigSource(Path.Combine(Util.configDir(), "OpenSim.ini"));
                 loadGridInfo(configSource);
@@ -84,15 +84,15 @@ namespace OpenSim.Framework.Communications
                 IConfig startupCfg = configSource.Configs["Startup"];
                 IConfig gridCfg = configSource.Configs["GridInfo"];
                 IConfig netCfg = configSource.Configs["Network"];
-                
+
                 bool grid = startupCfg.GetBoolean("gridmode", false);
-                
+
                 if (grid)
                     _info["mode"] = "grid";
-                else 
+                else
                     _info["mode"] = "standalone";
-                
-                
+
+
                 if (null != gridCfg)
                 {
                     foreach (string k in gridCfg.GetKeys())
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f437902..224b51b 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -351,8 +351,8 @@ namespace OpenSim.Framework
 
         bool SendLogoutPacketWhenClosing
         {
-            set; 
-        } 
+            set;
+        }
 
         // [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")]
         uint CircuitCode { get; }
@@ -526,7 +526,7 @@ namespace OpenSim.Framework
         event TerrainUnacked OnUnackedTerrain;
         event ActivateGesture OnActivateGesture;
         event DeactivateGesture OnDeactivateGesture;
-       
+
    //     void ActivateGesture(LLUUID assetId, LLUUID gestureId);
 
         // [Obsolete("IClientAPI.OutPacket SHOULD NOT EXIST outside of LLClientView please refactor appropriately.")]
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 79929bd..d326b66 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -278,7 +278,7 @@ namespace OpenSim.Framework.Servers
                             HandleLLSDRequests(request, response);
 
                             return;
-                        }   
+                        }
                         HandleXmlRpcRequests(request, response);
                         return;
                 }
@@ -498,7 +498,7 @@ namespace OpenSim.Framework.Servers
                 {
                     // we didn't find a registered llsd handler to service this request
                     // check if we have a default llsd handler
-                    
+
                     if (m_defaultLlsdHandler != null)
                     {
                         // LibOMV path
@@ -541,7 +541,7 @@ namespace OpenSim.Framework.Servers
 
         private bool DoWeHaveALLSDHandler(string path)
         {
-            
+
             string[] pathbase = path.Split('/');
             string searchquery = "/";
 
@@ -559,27 +559,27 @@ namespace OpenSim.Framework.Servers
 
             foreach (string pattern in m_llsdHandlers.Keys)
             {
-                
+
                 if (searchquery.StartsWith(pattern) && searchquery.Length >= pattern.Length)
                 {
-                    
+
                         bestMatch = pattern;
-                   
+
                 }
             }
 
-            // extra kicker to remove the default XMLRPC login case..  just in case..  
+            // extra kicker to remove the default XMLRPC login case..  just in case..
             if (path == "/")
                 return false;
 
             if (String.IsNullOrEmpty(bestMatch))
             {
-                
+
                 return false;
             }
             else
             {
-                
+
                 return true;
             }
         }
@@ -588,7 +588,7 @@ namespace OpenSim.Framework.Servers
         {
             llsdHandler = null;
             // Pull out the first part of the path
-            // splitting the path by '/' means we'll get the following return.. 
+            // splitting the path by '/' means we'll get the following return..
             // {0}/{1}/{2}
             // where {0} isn't something we really control 100%
 
@@ -599,7 +599,7 @@ namespace OpenSim.Framework.Servers
                 return false;
 
             for (int i=1; i<pathbase.Length; i++)
-            {   
+            {
                 searchquery += pathbase[i];
                 if (pathbase.Length-1 != i)
                     searchquery += "/";
@@ -609,7 +609,7 @@ namespace OpenSim.Framework.Servers
             //
             //   [] = optional
             //   /resource/UUID/action[/action]
-            // 
+            //
             // now try to get the closest match to the reigstered path
             // at least for OGP, registered path would probably only consist of the /resource/
 
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index b26d397..794dbd8 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -107,20 +107,20 @@ namespace OpenSim.Framework.Servers
             {
                 sb.Append(m_stats.Report());
             }
-            
-            sb.Append(Environment.NewLine);            
+
+            sb.Append(Environment.NewLine);
             sb.Append(GetThreadsReport());
 
             m_log.Debug(sb);
         }
-                
+
         /// <summary>
         /// Get a report about the registered threads in this server.
         /// </summary>
         protected string GetThreadsReport()
         {
             StringBuilder sb = new StringBuilder();
-            
+
             List<Thread> threads = ThreadTracker.GetThreads();
             if (threads == null)
             {
@@ -132,13 +132,13 @@ namespace OpenSim.Framework.Servers
                 foreach (Thread t in threads)
                 {
                     sb.Append(
-                        "ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive 
+                        "ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive
                         + ", Pri: " + t.Priority + ", State: " + t.ThreadState + Environment.NewLine);
                 }
-            }   
-            
+            }
+
             return sb.ToString();
-        }        
+        }
 
         /// <summary>
         /// Return a report about the uptime of this server
@@ -312,7 +312,7 @@ namespace OpenSim.Framework.Servers
 
                 return;
             }
-        }                
+        }
 
         /// <summary>
         /// Outputs to the console information about the region
-- 
cgit v1.1