diff options
author | lbsa71 | 2007-10-05 13:54:16 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-05 13:54:16 +0000 |
commit | d4a4aafaf15360c0f5db22145a60bae87e6bb9c6 (patch) | |
tree | 72915aa8a9f3777a52fe8677c764a192d448e492 /OpenSim/Region/Communications/Local | |
parent | * minor refactoring (diff) | |
download | opensim-SC_OLD-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.zip opensim-SC_OLD-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.gz opensim-SC_OLD-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.bz2 opensim-SC_OLD-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.xz |
* So, ok, maybe renaming serialized fields on a friday wasn't the smartest of things. Reverting 2056.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalLoginService.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index f2148ca..6829598 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs | |||
@@ -70,26 +70,26 @@ namespace OpenSim.Region.Communications.Local | |||
70 | } | 70 | } |
71 | else | 71 | else |
72 | { | 72 | { |
73 | Console.WriteLine("Authenticating " + profile.Firstname + " " + profile.Lastname); | 73 | Console.WriteLine("Authenticating " + profile.username + " " + profile.surname); |
74 | 74 | ||
75 | password = password.Remove(0, 3); //remove $1$ | 75 | password = password.Remove(0, 3); //remove $1$ |
76 | 76 | ||
77 | string s = Util.Md5Hash(password + ":" + profile.PasswordSalt); | 77 | string s = Util.Md5Hash(password + ":" + profile.passwordSalt); |
78 | 78 | ||
79 | return profile.PasswordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase); | 79 | return profile.passwordHash.Equals(s.ToString(), StringComparison.InvariantCultureIgnoreCase); |
80 | } | 80 | } |
81 | } | 81 | } |
82 | 82 | ||
83 | public override void CustomiseResponse(LoginResponse response, UserProfileData theUser) | 83 | public override void CustomiseResponse(LoginResponse response, UserProfileData theUser) |
84 | { | 84 | { |
85 | ulong currentRegion = theUser.CurrentAgent.currentHandle; | 85 | ulong currentRegion = theUser.currentAgent.currentHandle; |
86 | RegionInfo reg = m_Parent.GridService.RequestNeighbourInfo(currentRegion); | 86 | RegionInfo reg = m_Parent.GridService.RequestNeighbourInfo(currentRegion); |
87 | 87 | ||
88 | if (reg != null) | 88 | if (reg != null) |
89 | { | 89 | { |
90 | response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " + | 90 | response.Home = "{'region_handle':[r" + (reg.RegionLocX * 256).ToString() + ",r" + (reg.RegionLocY * 256).ToString() + "], " + |
91 | "'position':[r" + theUser.HomeLocation.X.ToString() + ",r" + theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "], " + | 91 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + |
92 | "'look_at':[r" + theUser.HomeLocation.X.ToString() + ",r" + theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "]}"; | 92 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; |
93 | string capsPath = Util.GetRandomCapsPath(); | 93 | string capsPath = Util.GetRandomCapsPath(); |
94 | response.SimAddress = reg.ExternalEndPoint.Address.ToString(); | 94 | response.SimAddress = reg.ExternalEndPoint.Address.ToString(); |
95 | response.SimPort = (Int32)reg.ExternalEndPoint.Port; | 95 | response.SimPort = (Int32)reg.ExternalEndPoint.Port; |
@@ -99,8 +99,8 @@ namespace OpenSim.Region.Communications.Local | |||
99 | 99 | ||
100 | response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; | 100 | response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CAPS/" + capsPath + "0000/"; |
101 | // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/"; | 101 | // response.SeedCapability = "http://" + reg.ExternalHostName + ":" + this.serversInfo.HttpListenerPort.ToString() + "/CapsSeed/" + capsPath + "0000/"; |
102 | theUser.CurrentAgent.currentRegion = reg.SimUUID; | 102 | theUser.currentAgent.currentRegion = reg.SimUUID; |
103 | theUser.CurrentAgent.currentHandle = reg.RegionHandle; | 103 | theUser.currentAgent.currentHandle = reg.RegionHandle; |
104 | 104 | ||
105 | Login _login = new Login(); | 105 | Login _login = new Login(); |
106 | //copy data to login object | 106 | //copy data to login object |