diff options
| author | Kitto Flora | 2011-02-04 17:32:31 +0000 |
|---|---|---|
| committer | Kitto Flora | 2011-02-04 17:32:31 +0000 |
| commit | 511b12db6b42f93b552ae9c50043246f35bab890 (patch) | |
| tree | c57097093283396d07b07b3f3a796ed851027510 /OpenSim/Region/Framework | |
| parent | Corrections for Avatar Auto-pilot target; add llStopMoveToTarget() for Avatar... (diff) | |
| parent | Repair x-query-string (diff) | |
| download | opensim-SC_OLD-511b12db6b42f93b552ae9c50043246f35bab890.zip opensim-SC_OLD-511b12db6b42f93b552ae9c50043246f35bab890.tar.gz opensim-SC_OLD-511b12db6b42f93b552ae9c50043246f35bab890.tar.bz2 opensim-SC_OLD-511b12db6b42f93b552ae9c50043246f35bab890.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c65a82b..2424194 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2555,6 +2555,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2555 | { | 2555 | { |
| 2556 | */ | 2556 | */ |
| 2557 | UserAccount uac = UserAccountService.GetUserAccount(RegionInfo.ScopeID, user); | 2557 | UserAccount uac = UserAccountService.GetUserAccount(RegionInfo.ScopeID, user); |
| 2558 | if (uac == null) | ||
| 2559 | return 0; | ||
| 2558 | return uac.UserFlags; | 2560 | return uac.UserFlags; |
| 2559 | //} | 2561 | //} |
| 2560 | } | 2562 | } |