diff options
author | Melanie | 2011-11-06 20:12:57 +0000 |
---|---|---|
committer | Melanie | 2011-11-06 20:12:57 +0000 |
commit | 51bad0f8aecd069402d418c76bf943110c45e56c (patch) | |
tree | 791d01b398bb7c13454d4598e4f46b627dd830be /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Break out the parts of ScenePresence that differ from core (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-51bad0f8aecd069402d418c76bf943110c45e56c.zip opensim-SC-51bad0f8aecd069402d418c76bf943110c45e56c.tar.gz opensim-SC-51bad0f8aecd069402d418c76bf943110c45e56c.tar.bz2 opensim-SC-51bad0f8aecd069402d418c76bf943110c45e56c.tar.xz |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 0e29b60..eb3597d 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -774,7 +774,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
774 | m_localId = m_scene.AllocateLocalId(); | 774 | m_localId = m_scene.AllocateLocalId(); |
775 | 775 | ||
776 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid); | 776 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid); |
777 | m_userFlags = account.UserFlags; | 777 | if (account != null) |
778 | m_userFlags = account.UserFlags; | ||
779 | else | ||
780 | m_userFlags = 0; | ||
778 | 781 | ||
779 | if (account != null) | 782 | if (account != null) |
780 | UserLevel = account.UserLevel; | 783 | UserLevel = account.UserLevel; |