Merge branch 'master' into careminster-presence-refactor

2 files changed, 3 insertions, 1 deletions

diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 36cce75..c6e33bb 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Services.UserAccountService
             info.HomePosition = Vector3.Parse(d.Data["HomePosition"]);
             info.HomeLookAt = Vector3.Parse(d.Data["HomeLookAt"]);
 
-            return info;            
+            return info;
         }
         
         public bool StoreGridUserInfo(GridUserInfo info)
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index 82c34e7..38caf74 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -200,7 +200,9 @@ namespace OpenSim.Services.UserAccountService
             }
 
             if (d.Length < 1)
+            {
                 return null;
+            }
 
             return MakeUserAccount(d[0]);
         }