diff options
| author | Homer Horwitz | 2008-11-16 23:53:00 +0000 |
|---|---|---|
| committer | Homer Horwitz | 2008-11-16 23:53:00 +0000 |
| commit | 4343ddeec1a7c415444df1f705a0c130198b8e84 (patch) | |
| tree | 0d45a3e42ad97498530ba4555d88950266dfe33e | |
| parent | Fix friends again. Friends-handling is now stateless and, thanks to (diff) | |
| download | opensim-SC_OLD-4343ddeec1a7c415444df1f705a0c130198b8e84.zip opensim-SC_OLD-4343ddeec1a7c415444df1f705a0c130198b8e84.tar.gz opensim-SC_OLD-4343ddeec1a7c415444df1f705a0c130198b8e84.tar.bz2 opensim-SC_OLD-4343ddeec1a7c415444df1f705a0c130198b8e84.tar.xz | |
Fix NRE on TP-to-home, if the home-region is unavailable.
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 0416e3a..c055160 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
| @@ -2402,8 +2402,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 2402 | if (regionInfo == null) | 2402 | if (regionInfo == null) |
| 2403 | { | 2403 | { |
| 2404 | regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion); | 2404 | regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion); |
| 2405 | UserProfile.HomeRegionID = regionInfo.RegionID; | 2405 | if(regionInfo != null) // home region can be away temporarily, too |
| 2406 | CommsManager.UserService.UpdateUserProfile(UserProfile); | 2406 | { |
| 2407 | UserProfile.HomeRegionID = regionInfo.RegionID; | ||
| 2408 | CommsManager.UserService.UpdateUserProfile(UserProfile); | ||
| 2409 | } | ||
| 2407 | } | 2410 | } |
| 2408 | if (regionInfo == null) | 2411 | if (regionInfo == null) |
| 2409 | { | 2412 | { |