diff options
Diffstat (limited to 'OpenSim/Data/MSSQL')
| -rw-r--r-- | OpenSim/Data/MSSQL/MSSQLDataStore.cs | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs index 4cb2b45..d9d41e0 100644 --- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs +++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs | |||
| @@ -932,18 +932,19 @@ namespace OpenSim.Data.MSSQL | |||
| 932 | ); | 932 | ); |
| 933 | try | 933 | try |
| 934 | { | 934 | { |
| 935 | prim.SetSitTargetLL(new LLVector3( | 935 | prim.SitTargetPositionLL = new LLVector3( |
| 936 | Convert.ToSingle(row["SitTargetOffsetX"]), | 936 | Convert.ToSingle(row["SitTargetOffsetX"]), |
| 937 | Convert.ToSingle(row["SitTargetOffsetY"]), | 937 | Convert.ToSingle(row["SitTargetOffsetY"]), |
| 938 | Convert.ToSingle(row["SitTargetOffsetZ"])), new LLQuaternion( | 938 | Convert.ToSingle(row["SitTargetOffsetZ"])); |
| 939 | Convert.ToSingle( | 939 | prim.SitTargetOrientationLL = new LLQuaternion( |
| 940 | row["SitTargetOrientX"]), | 940 | Convert.ToSingle( |
| 941 | Convert.ToSingle( | 941 | row["SitTargetOrientX"]), |
| 942 | row["SitTargetOrientY"]), | 942 | Convert.ToSingle( |
| 943 | Convert.ToSingle( | 943 | row["SitTargetOrientY"]), |
| 944 | row["SitTargetOrientZ"]), | 944 | Convert.ToSingle( |
| 945 | Convert.ToSingle( | 945 | row["SitTargetOrientZ"]), |
| 946 | row["SitTargetOrientW"]))); | 946 | Convert.ToSingle( |
| 947 | row["SitTargetOrientW"])); | ||
| 947 | } | 948 | } |
| 948 | catch (InvalidCastException) | 949 | catch (InvalidCastException) |
| 949 | { | 950 | { |
| @@ -1136,12 +1137,12 @@ namespace OpenSim.Data.MSSQL | |||
| 1136 | try | 1137 | try |
| 1137 | { | 1138 | { |
| 1138 | // Sit target | 1139 | // Sit target |
| 1139 | LLVector3 sitTargetPos = prim.GetSitTargetPositionLL(); | 1140 | LLVector3 sitTargetPos = prim.SitTargetPositionLL; |
| 1140 | row["SitTargetOffsetX"] = sitTargetPos.X; | 1141 | row["SitTargetOffsetX"] = sitTargetPos.X; |
| 1141 | row["SitTargetOffsetY"] = sitTargetPos.Y; | 1142 | row["SitTargetOffsetY"] = sitTargetPos.Y; |
| 1142 | row["SitTargetOffsetZ"] = sitTargetPos.Z; | 1143 | row["SitTargetOffsetZ"] = sitTargetPos.Z; |
| 1143 | 1144 | ||
| 1144 | LLQuaternion sitTargetOrient = prim.GetSitTargetOrientationLL(); | 1145 | LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL; |
| 1145 | row["SitTargetOrientW"] = sitTargetOrient.W; | 1146 | row["SitTargetOrientW"] = sitTargetOrient.W; |
| 1146 | row["SitTargetOrientX"] = sitTargetOrient.X; | 1147 | row["SitTargetOrientX"] = sitTargetOrient.X; |
| 1147 | row["SitTargetOrientY"] = sitTargetOrient.Y; | 1148 | row["SitTargetOrientY"] = sitTargetOrient.Y; |