diff options
| author | lbsa71 | 2009-02-07 09:45:56 +0000 |
|---|---|---|
| committer | lbsa71 | 2009-02-07 09:45:56 +0000 |
| commit | 4d4402158e41d810e44c86c77eb146d8122198aa (patch) | |
| tree | 6f82ecfb79ea3ed7b1f6b9edd55f6f8e9cf9a505 /OpenSim | |
| parent | oops spaces where tabs should be in the makefile (diff) | |
| download | opensim-SC_OLD-4d4402158e41d810e44c86c77eb146d8122198aa.zip opensim-SC_OLD-4d4402158e41d810e44c86c77eb146d8122198aa.tar.gz opensim-SC_OLD-4d4402158e41d810e44c86c77eb146d8122198aa.tar.bz2 opensim-SC_OLD-4d4402158e41d810e44c86c77eb146d8122198aa.tar.xz | |
Thank you dslake for a patch that:
* fixes mantis #3092: User Server sets agent starting position to passed x/y/x instead of x/y/z
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Communications/Local/LocalLoginService.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index f19e564..dfc44ef 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
| @@ -251,7 +251,7 @@ namespace OpenSim.Grid.UserServer | |||
| 251 | else | 251 | else |
| 252 | { | 252 | { |
| 253 | theUser.CurrentAgent.Position = new Vector3(float.Parse(uriMatch.Groups["x"].Value), | 253 | theUser.CurrentAgent.Position = new Vector3(float.Parse(uriMatch.Groups["x"].Value), |
| 254 | float.Parse(uriMatch.Groups["y"].Value), float.Parse(uriMatch.Groups["x"].Value)); | 254 | float.Parse(uriMatch.Groups["y"].Value), float.Parse(uriMatch.Groups["z"].Value)); |
| 255 | } | 255 | } |
| 256 | } | 256 | } |
| 257 | response.LookAt = "[r0,r1,r0]"; | 257 | response.LookAt = "[r0,r1,r0]"; |
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index c572b3b..159773b 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
| @@ -210,7 +210,7 @@ namespace OpenSim.Region.Communications.Local | |||
| 210 | else | 210 | else |
| 211 | { | 211 | { |
| 212 | theUser.CurrentAgent.Position = new Vector3(float.Parse(uriMatch.Groups["x"].Value), | 212 | theUser.CurrentAgent.Position = new Vector3(float.Parse(uriMatch.Groups["x"].Value), |
| 213 | float.Parse(uriMatch.Groups["y"].Value), float.Parse(uriMatch.Groups["x"].Value)); | 213 | float.Parse(uriMatch.Groups["y"].Value), float.Parse(uriMatch.Groups["z"].Value)); |
| 214 | } | 214 | } |
| 215 | } | 215 | } |
| 216 | response.LookAt = "[r0,r1,r0]"; | 216 | response.LookAt = "[r0,r1,r0]"; |