diff options
| author | UbitUmarov | 2015-08-19 08:48:50 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-08-19 08:48:50 +0100 |
| commit | 0b105da626ae8c2fb519a817b827f90534ed7d08 (patch) | |
| tree | 509e6d091fb12f38fd09528335e51aeedbe59c08 /OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |
| parent | Merge branch 'master' into ubitworkmaster (diff) | |
| parent | varregion: update MapImageServiceModule to upload multiple map tiles for larg... (diff) | |
| download | opensim-SC-0b105da626ae8c2fb519a817b827f90534ed7d08.zip opensim-SC-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.gz opensim-SC-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.bz2 opensim-SC-0b105da626ae8c2fb519a817b827f90534ed7d08.tar.xz | |
Merge branch 'mbworkvar2' into ubitvar
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index db8405b..7177d9b 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
| @@ -663,8 +663,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
| 663 | 663 | ||
| 664 | Vector3 avaPos = p.AbsolutePosition; | 664 | Vector3 avaPos = p.AbsolutePosition; |
| 665 | // Getting the global position for the Avatar | 665 | // Getting the global position for the Avatar |
| 666 | Vector3 posGlobal = new Vector3(remoteClient.Scene.RegionInfo.RegionLocX*Constants.RegionSize + avaPos.X, | 666 | Vector3 posGlobal = new Vector3(remoteClient.Scene.RegionInfo.WorldLocX + avaPos.X, |
| 667 | remoteClient.Scene.RegionInfo.RegionLocY*Constants.RegionSize + avaPos.Y, | 667 | remoteClient.Scene.RegionInfo.WorldLocY + avaPos.Y, |
| 668 | avaPos.Z); | 668 | avaPos.Z); |
| 669 | 669 | ||
| 670 | string landOwnerName = string.Empty; | 670 | string landOwnerName = string.Empty; |
| @@ -1353,4 +1353,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
| 1353 | } | 1353 | } |
| 1354 | #endregion Web Util | 1354 | #endregion Web Util |
| 1355 | } | 1355 | } |
| 1356 | } \ No newline at end of file | 1356 | } |