aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorlbsa712007-10-05 13:54:16 +0000
committerlbsa712007-10-05 13:54:16 +0000
commitd4a4aafaf15360c0f5db22145a60bae87e6bb9c6 (patch)
tree72915aa8a9f3777a52fe8677c764a192d448e492 /OpenSim/Region
parent* minor refactoring (diff)
downloadopensim-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.cs16
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs28
2 files changed, 22 insertions, 22 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
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 80b6d74..32f39b4 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -24,26 +24,26 @@ namespace OpenSim.Region.Communications.OGS1
24 } 24 }
25 25
26 UserProfileData userData = new UserProfileData(); 26 UserProfileData userData = new UserProfileData();
27 userData.Firstname = (string)data["firstname"]; 27 userData.username = (string)data["firstname"];
28 userData.Lastname = (string)data["lastname"]; 28 userData.surname = (string)data["lastname"];
29 userData.UUID = new LLUUID((string)data["uuid"]); 29 userData.UUID = new LLUUID((string)data["uuid"]);
30 userData.UserInventoryUri = (string)data["server_inventory"]; 30 userData.userInventoryURI = (string)data["server_inventory"];
31 userData.UserAssetUri = (string)data["server_asset"]; 31 userData.userAssetURI = (string)data["server_asset"];
32 userData.ProfileFirstText = (string)data["profile_firstlife_about"]; 32 userData.profileFirstText = (string)data["profile_firstlife_about"];
33 userData.ProfileFirstImage = new LLUUID((string)data["profile_firstlife_image"]); 33 userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]);
34 userData.ProfileCanDoMask = Convert.ToUInt32((string)data["profile_can_do"]); 34 userData.profileCanDoMask = Convert.ToUInt32((string)data["profile_can_do"]);
35 userData.ProfileWantDoMask = Convert.ToUInt32(data["profile_want_do"]); 35 userData.profileWantDoMask = Convert.ToUInt32(data["profile_want_do"]);
36 userData.ProfileImage = new LLUUID((string)data["profile_image"]); 36 userData.profileImage = new LLUUID((string)data["profile_image"]);
37 userData.LastLogin = Convert.ToInt32((string)data["profile_lastlogin"]); 37 userData.lastLogin = Convert.ToInt32((string)data["profile_lastlogin"]);
38 userData.HomeRegion = Convert.ToUInt64((string)data["home_region"]); 38 userData.homeRegion = Convert.ToUInt64((string)data["home_region"]);
39 userData.HomeLocation = new LLVector3((float)Convert.ToDecimal((string)data["home_coordinates_x"]), (float)Convert.ToDecimal((string)data["home_coordinates_y"]), (float)Convert.ToDecimal((string)data["home_coordinates_z"])); 39 userData.homeLocation = new LLVector3((float)Convert.ToDecimal((string)data["home_coordinates_x"]), (float)Convert.ToDecimal((string)data["home_coordinates_y"]), (float)Convert.ToDecimal((string)data["home_coordinates_z"]));
40 userData.HomeLookAt = new LLVector3((float)Convert.ToDecimal((string)data["home_look_x"]), (float)Convert.ToDecimal((string)data["home_look_y"]), (float)Convert.ToDecimal((string)data["home_look_z"])); 40 userData.homeLookAt = new LLVector3((float)Convert.ToDecimal((string)data["home_look_x"]), (float)Convert.ToDecimal((string)data["home_look_y"]), (float)Convert.ToDecimal((string)data["home_look_z"]));
41 41
42 return userData; 42 return userData;
43 } 43 }
44 public UserProfileData GetUserProfile(string firstName, string lastName) 44 public UserProfileData GetUserProfile(string firstName, string lastName)
45 { 45 {
46 return GetUserProfile(firstName, lastName); 46 return GetUserProfile(firstName + " " + lastName);
47 } 47 }
48 public UserProfileData GetUserProfile(string name) 48 public UserProfileData GetUserProfile(string name)
49 { 49 {