diff options
author | Justin Clarke Casey | 2008-09-12 20:12:03 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-09-12 20:12:03 +0000 |
commit | 52a4c4d82f9c5b808e6c61fd51c1c70e42865565 (patch) | |
tree | f63a4ea443597b2d79ad6c2b7acff058c4437425 /OpenSim/Data | |
parent | remove hidden faces inside prim meshes to improve memory use and startup time (diff) | |
download | opensim-SC_OLD-52a4c4d82f9c5b808e6c61fd51c1c70e42865565.zip opensim-SC_OLD-52a4c4d82f9c5b808e6c61fd51c1c70e42865565.tar.gz opensim-SC_OLD-52a4c4d82f9c5b808e6c61fd51c1c70e42865565.tar.bz2 opensim-SC_OLD-52a4c4d82f9c5b808e6c61fd51c1c70e42865565.tar.xz |
* Check in first part of http://opensimulator.org/mantis/view.php?id=2073
* This patch aims to introduce look at direction persistence between logins. It won't be active until the second part of the patch is committed in about two weeks time. At
this point, region servers that haven't upgraded past this revision may run into problems
* This checkin upgrades the user database. As always, we recommend you have backups in case something goes wrong.
* Many thanks to tyre for this patch.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLManager.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index 6048f93..5f830bb 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs | |||
@@ -512,6 +512,8 @@ namespace OpenSim.Data.MySQL | |||
512 | Vector3 tmp_v; | 512 | Vector3 tmp_v; |
513 | Vector3.TryParse((string) reader["currentPos"], out tmp_v); | 513 | Vector3.TryParse((string) reader["currentPos"], out tmp_v); |
514 | retval.Position = tmp_v; | 514 | retval.Position = tmp_v; |
515 | Vector3.TryParse((string)reader["currentLookAt"], out tmp_v); | ||
516 | retval.LookAt = tmp_v; | ||
515 | } | 517 | } |
516 | else | 518 | else |
517 | { | 519 | { |
@@ -1095,8 +1097,8 @@ namespace OpenSim.Data.MySQL | |||
1095 | { | 1097 | { |
1096 | string sql = String.Empty; | 1098 | string sql = String.Empty; |
1097 | sql += "REPLACE INTO "; | 1099 | sql += "REPLACE INTO "; |
1098 | sql += "agents (UUID, sessionID, secureSessionID, agentIP, agentPort, agentOnline, loginTime, logoutTime, currentRegion, currentHandle, currentPos) VALUES "; | 1100 | sql += "agents (UUID, sessionID, secureSessionID, agentIP, agentPort, agentOnline, loginTime, logoutTime, currentRegion, currentHandle, currentPos, currentLookAt) VALUES "; |
1099 | sql += "(?UUID, ?sessionID, ?secureSessionID, ?agentIP, ?agentPort, ?agentOnline, ?loginTime, ?logoutTime, ?currentRegion, ?currentHandle, ?currentPos);"; | 1101 | sql += "(?UUID, ?sessionID, ?secureSessionID, ?agentIP, ?agentPort, ?agentOnline, ?loginTime, ?logoutTime, ?currentRegion, ?currentHandle, ?currentPos, ?currentLookAt);"; |
1100 | Dictionary<string, string> parameters = new Dictionary<string, string>(); | 1102 | Dictionary<string, string> parameters = new Dictionary<string, string>(); |
1101 | 1103 | ||
1102 | parameters["?UUID"] = agentdata.ProfileID.ToString(); | 1104 | parameters["?UUID"] = agentdata.ProfileID.ToString(); |
@@ -1109,7 +1111,8 @@ namespace OpenSim.Data.MySQL | |||
1109 | parameters["?logoutTime"] = agentdata.LogoutTime.ToString(); | 1111 | parameters["?logoutTime"] = agentdata.LogoutTime.ToString(); |
1110 | parameters["?currentRegion"] = agentdata.Region.ToString(); | 1112 | parameters["?currentRegion"] = agentdata.Region.ToString(); |
1111 | parameters["?currentHandle"] = agentdata.Handle.ToString(); | 1113 | parameters["?currentHandle"] = agentdata.Handle.ToString(); |
1112 | parameters["?currentPos"] = "<" + ((int)agentdata.Position.X).ToString() + "," + ((int)agentdata.Position.Y).ToString() + "," + ((int)agentdata.Position.Z).ToString() + ">"; | 1114 | parameters["?currentPos"] = "<" + (agentdata.Position.X).ToString() + "," + (agentdata.Position.Y).ToString() + "," + (agentdata.Position.Z).ToString() + ">"; |
1115 | parameters["?currentLookAt"] = "<" + (agentdata.LookAt.X).ToString() + "," + (agentdata.LookAt.Y).ToString() + "," + (agentdata.LookAt.Z).ToString() + ">"; | ||
1113 | 1116 | ||
1114 | bool returnval = false; | 1117 | bool returnval = false; |
1115 | 1118 | ||