aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2009-12-05 19:53:54 +0000
committerMelanie2009-12-05 19:53:54 +0000
commit43a6fa1d01707fda74b8ba7c2d9fb95210463b6a (patch)
tree77c5897901544e82467b1cdfafdc63644ee821ef /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'master' into careminster (diff)
parent* Fix line endings in BaseHttpServer.cs (diff)
downloadopensim-SC_OLD-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.zip
opensim-SC_OLD-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.gz
opensim-SC_OLD-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.bz2
opensim-SC_OLD-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f5a1e74..a8bab5a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3046,6 +3046,7 @@ namespace OpenSim.Region.Framework.Scenes
3046 // TODO: The next line can be removed, as soon as only homeRegionID based UserServers are around. 3046 // TODO: The next line can be removed, as soon as only homeRegionID based UserServers are around.
3047 // TODO: The HomeRegion property can be removed then, too 3047 // TODO: The HomeRegion property can be removed then, too
3048 UserProfile.HomeRegion = RegionInfo.RegionHandle; 3048 UserProfile.HomeRegion = RegionInfo.RegionHandle;
3049
3049 UserProfile.HomeLocation = position; 3050 UserProfile.HomeLocation = position;
3050 UserProfile.HomeLookAt = lookAt; 3051 UserProfile.HomeLookAt = lookAt;
3051 CommsManager.UserService.UpdateUserProfile(UserProfile); 3052 CommsManager.UserService.UpdateUserProfile(UserProfile);