aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-11-06 20:00:03 +0000
committerMelanie2011-11-06 20:00:03 +0000
commit0bf757e42bf161af8a266142dde530034bfdb3fa (patch)
treeb775d1310f5fe72362efd6debb42726940cabe8c /OpenSim
parentFix build break (diff)
downloadopensim-SC_OLD-0bf757e42bf161af8a266142dde530034bfdb3fa.zip
opensim-SC_OLD-0bf757e42bf161af8a266142dde530034bfdb3fa.tar.gz
opensim-SC_OLD-0bf757e42bf161af8a266142dde530034bfdb3fa.tar.bz2
opensim-SC_OLD-0bf757e42bf161af8a266142dde530034bfdb3fa.tar.xz
Allow HG and other scene presences not linked to a user account to function.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 6fbc410..99be46d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -773,7 +773,10 @@ namespace OpenSim.Region.Framework.Scenes
773 m_localId = m_scene.AllocateLocalId(); 773 m_localId = m_scene.AllocateLocalId();
774 774
775 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid); 775 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid);
776 m_userFlags = account.UserFlags; 776 if (account != null)
777 m_userFlags = account.UserFlags;
778 else
779 m_userFlags = 0;
777 780
778 if (account != null) 781 if (account != null)
779 UserLevel = account.UserLevel; 782 UserLevel = account.UserLevel;