Fix NRE on TP-to-home, if the home-region is unavailable.
parent
07afe9c137
commit
4343ddeec1
|
@ -2402,8 +2402,11 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
if (regionInfo == null)
|
if (regionInfo == null)
|
||||||
{
|
{
|
||||||
regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion);
|
regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion);
|
||||||
UserProfile.HomeRegionID = regionInfo.RegionID;
|
if(regionInfo != null) // home region can be away temporarily, too
|
||||||
CommsManager.UserService.UpdateUserProfile(UserProfile);
|
{
|
||||||
|
UserProfile.HomeRegionID = regionInfo.RegionID;
|
||||||
|
CommsManager.UserService.UpdateUserProfile(UserProfile);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (regionInfo == null)
|
if (regionInfo == null)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue