diff options
| author | dahlia | 2010-03-13 12:04:49 -0800 |
|---|---|---|
| committer | dahlia | 2010-03-13 12:04:49 -0800 |
| commit | 2ebc4be99d20269dd3cc261022f5f760b54fde6c (patch) | |
| tree | 321fad6a6271f619cdf42c92172027498fd685b6 /OpenSim/Region | |
| parent | correct some references which could produce erroneous prim face numbers (diff) | |
| download | opensim-SC-2ebc4be99d20269dd3cc261022f5f760b54fde6c.zip opensim-SC-2ebc4be99d20269dd3cc261022f5f760b54fde6c.tar.gz opensim-SC-2ebc4be99d20269dd3cc261022f5f760b54fde6c.tar.bz2 opensim-SC-2ebc4be99d20269dd3cc261022f5f760b54fde6c.tar.xz | |
add a null check in ScenePresence constructor
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 317c908..6f16ff3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -676,7 +676,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 676 | 676 | ||
| 677 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid); | 677 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid); |
| 678 | 678 | ||
| 679 | m_userLevel = account.UserLevel; | 679 | if (account != null) |
| 680 | m_userLevel = account.UserLevel; | ||
| 680 | 681 | ||
| 681 | IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); | 682 | IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>(); |
| 682 | if (gm != null) | 683 | if (gm != null) |