Update svn properties. Formatting cleanup.

5 files changed, 17 insertions, 12 deletions

diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index c776c36..e0e5656 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Grid.AssetServer
             m_assetProvider = assetProvider;
         }
 
-        public override byte[] Handle(string path, Stream request, 
+        public override byte[] Handle(string path, Stream request,
                                       OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
             string param = GetParam(path);
@@ -123,7 +123,7 @@ namespace OpenSim.Grid.AssetServer
         private OpenAsset_Main m_assetManager;
         private IAssetProvider m_assetProvider;
 
-        public override byte[] Handle(string path, Stream request, 
+        public override byte[] Handle(string path, Stream request,
                                       OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
             string param = GetParam(path);
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 5a6a328..d0eec32 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -880,7 +880,7 @@ namespace OpenSim.Grid.GridServer
         /// <param name="httpRequest">HTTP request header object</param>
         /// <param name="httpResponse">HTTP response header object</param>
         /// <returns></returns>
-        public string RestGetRegionMethod(string request, string path, string param, 
+        public string RestGetRegionMethod(string request, string path, string param,
                                           OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
             return RestGetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse);
@@ -895,7 +895,7 @@ namespace OpenSim.Grid.GridServer
         /// <param name="httpRequest">HTTP request header object</param>
         /// <param name="httpResponse">HTTP response header object</param>
         /// <returns></returns>
-        public string RestSetRegionMethod(string request, string path, string param, 
+        public string RestSetRegionMethod(string request, string path, string param,
                                           OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
             return RestSetSimMethod(String.Empty, "/sims/", param, httpRequest, httpResponse);
@@ -910,7 +910,7 @@ namespace OpenSim.Grid.GridServer
         /// <param name="httpRequest">HTTP request header object</param>
         /// <param name="httpResponse">HTTP response header object</param>
         /// <returns>Information about the sim in XML</returns>
-        public string RestGetSimMethod(string request, string path, string param, 
+        public string RestGetSimMethod(string request, string path, string param,
                                        OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
             string respstring = String.Empty;
@@ -958,7 +958,7 @@ namespace OpenSim.Grid.GridServer
         /// <param name="httpRequest">HTTP request header object</param>
         /// <param name="httpResponse">HTTP response header object</param>
         /// <returns>"OK" or an error</returns>
-        public string RestSetSimMethod(string request, string path, string param, 
+        public string RestSetSimMethod(string request, string path, string param,
                                        OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
             Console.WriteLine("Processing region update via REST method");
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index a5b256d..efe077d 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Grid.MessagingServer
 
         }
 
-        public override byte[] Handle(string path, Stream request, 
+        public override byte[] Handle(string path, Stream request,
                                       OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
             string param = GetParam(path);
@@ -86,7 +86,7 @@ namespace OpenSim.Grid.MessagingServer
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public override byte[] Handle(string path, Stream request, 
+        public override byte[] Handle(string path, Stream request,
                                       OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
             string param = GetParam(path);
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 3c9d650..628c471 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -119,7 +119,9 @@ namespace OpenSim.Grid.UserServer
                                 RegionProfileData.RequestSimProfileData(
                                     theUser.HomeRegion, m_config.GridServerURL,
                                     m_config.GridSendKey, m_config.GridRecvKey);
-                        } else {
+                        }
+                        else
+                        {
                             start_x = Convert.ToInt32(startLocationRequestParsed[1]);
                             start_y = Convert.ToInt32(startLocationRequestParsed[2]);
                             start_z = Convert.ToInt32(startLocationRequestParsed[3]);
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 706f461..a82505d 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Grid.UserServer
         /// <param name="httpRequest">HTTP request header object</param>
         /// <param name="httpResponse">HTTP response header object</param>
         /// <returns>Success "OK" else error</returns>
-        public string RestDeleteUserSessionMethod(string request, string path, string param, 
+        public string RestDeleteUserSessionMethod(string request, string path, string param,
                                                   OSHttpRequest httpRequest, OSHttpResponse httpResponse)
         {
             // TODO! Important!
@@ -260,11 +260,14 @@ namespace OpenSim.Grid.UserServer
             if (requestData.Contains("owner"))
             {
                 appearance = GetUserAppearance(new LLUUID((string)requestData["owner"]));
-                if (appearance == null) {
+                if (appearance == null)
+                {
                     responseData = new Hashtable();
                     responseData["error_type"] = "no appearance";
                     responseData["error_desc"] = "There was no appearance found for this avatar";
-                } else {
+                }
+                else
+                {
                     responseData = appearance.ToHashTable();
                 }
             }