From 08ba34da0325e3ed2a839cff62f2020742e887e7 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 31 Mar 2010 21:30:44 -0700
Subject: First attempt at fixing mantis #4641. It's better but there are now
 some issues with permissions. (looks like my commit is going to touch CM
 files, I'm going to let it do it - eof only)

---
 OpenSim/Framework/Communications/Osp/OspResolver.cs |  5 ++++-
 OpenSim/Framework/RegionInfo.cs                     | 12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Communications/Osp/OspResolver.cs b/OpenSim/Framework/Communications/Osp/OspResolver.cs
index 2e55f53..24ea64d 100644
--- a/OpenSim/Framework/Communications/Osp/OspResolver.cs
+++ b/OpenSim/Framework/Communications/Osp/OspResolver.cs
@@ -139,6 +139,9 @@ namespace OpenSim.Framework.Communications.Osp
         /// </returns>
         protected static UUID ResolveOspaName(string name, IUserAccountService userService)
         {
+            if (userService == null)
+                return UUID.Zero;
+
             int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR);
             
             if (nameSeparatorIndex < 0)
@@ -149,7 +152,7 @@ namespace OpenSim.Framework.Communications.Osp
             
             string firstName = name.Remove(nameSeparatorIndex).TrimEnd();
             string lastName = name.Substring(nameSeparatorIndex + 1).TrimStart();
-            
+
             UserAccount account = userService.GetUserAccount(UUID.Zero, firstName, lastName);
             if (account != null)
                 return account.PrincipalID;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 5eacd73..ad98816 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -38,7 +38,7 @@ using OpenSim.Framework.Console;
 
 
 namespace OpenSim.Framework
-{
+{
     public class RegionLightShareData : ICloneable
     {
         public UUID regionID = UUID.Zero;
@@ -86,11 +86,11 @@ namespace OpenSim.Framework
         {
             if (OnSave != null)
                 OnSave(this);
-        }
-        public object Clone()
-        {
-            return this.MemberwiseClone();      // call clone method
-        }
+        }
+        public object Clone()
+        {
+            return this.MemberwiseClone();      // call clone method
+        }
 
     }
 
-- 
cgit v1.1