diff options
| author | Sean Dague | 2008-07-07 20:12:14 +0000 |
|---|---|---|
| committer | Sean Dague | 2008-07-07 20:12:14 +0000 |
| commit | 867d72c9569e672d99dc5f50aca6b1a4f2ddf906 (patch) | |
| tree | c7eed9e29967623643fa63ddec600acc2948ebb4 /OpenSim/Data/SQLite/SQLiteRegionData.cs | |
| parent | remove build references to what I believe to be the very old MSSQL (diff) | |
| download | opensim-SC_OLD-867d72c9569e672d99dc5f50aca6b1a4f2ddf906.zip opensim-SC_OLD-867d72c9569e672d99dc5f50aca6b1a4f2ddf906.tar.gz opensim-SC_OLD-867d72c9569e672d99dc5f50aca6b1a4f2ddf906.tar.bz2 opensim-SC_OLD-867d72c9569e672d99dc5f50aca6b1a4f2ddf906.tar.xz | |
change SitTarget calls from functions to properties
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index effee9b..0e67fb9 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
| @@ -992,18 +992,19 @@ namespace OpenSim.Data.SQLite | |||
| 992 | 992 | ||
| 993 | try | 993 | try |
| 994 | { | 994 | { |
| 995 | prim.SetSitTargetLL(new LLVector3( | 995 | prim.SitTargetPositionLL = new LLVector3( |
| 996 | Convert.ToSingle(row["SitTargetOffsetX"]), | 996 | Convert.ToSingle(row["SitTargetOffsetX"]), |
| 997 | Convert.ToSingle(row["SitTargetOffsetY"]), | 997 | Convert.ToSingle(row["SitTargetOffsetY"]), |
| 998 | Convert.ToSingle(row["SitTargetOffsetZ"])), new LLQuaternion( | 998 | Convert.ToSingle(row["SitTargetOffsetZ"])); |
| 999 | Convert.ToSingle( | 999 | prim.SitTargetOrientationLL = new LLQuaternion( |
| 1000 | row["SitTargetOrientX"]), | 1000 | Convert.ToSingle( |
| 1001 | Convert.ToSingle( | 1001 | row["SitTargetOrientX"]), |
| 1002 | row["SitTargetOrientY"]), | 1002 | Convert.ToSingle( |
| 1003 | Convert.ToSingle( | 1003 | row["SitTargetOrientY"]), |
| 1004 | row["SitTargetOrientZ"]), | 1004 | Convert.ToSingle( |
| 1005 | Convert.ToSingle( | 1005 | row["SitTargetOrientZ"]), |
| 1006 | row["SitTargetOrientW"]))); | 1006 | Convert.ToSingle( |
| 1007 | row["SitTargetOrientW"])); | ||
| 1007 | } | 1008 | } |
| 1008 | catch (InvalidCastException) | 1009 | catch (InvalidCastException) |
| 1009 | { | 1010 | { |
| @@ -1334,12 +1335,12 @@ namespace OpenSim.Data.SQLite | |||
| 1334 | row["RotationW"] = prim.RotationOffset.W; | 1335 | row["RotationW"] = prim.RotationOffset.W; |
| 1335 | 1336 | ||
| 1336 | // Sit target | 1337 | // Sit target |
| 1337 | LLVector3 sitTargetPos = prim.GetSitTargetPositionLL(); | 1338 | LLVector3 sitTargetPos = prim.SitTargetPositionLL; |
| 1338 | row["SitTargetOffsetX"] = sitTargetPos.X; | 1339 | row["SitTargetOffsetX"] = sitTargetPos.X; |
| 1339 | row["SitTargetOffsetY"] = sitTargetPos.Y; | 1340 | row["SitTargetOffsetY"] = sitTargetPos.Y; |
| 1340 | row["SitTargetOffsetZ"] = sitTargetPos.Z; | 1341 | row["SitTargetOffsetZ"] = sitTargetPos.Z; |
| 1341 | 1342 | ||
| 1342 | LLQuaternion sitTargetOrient = prim.GetSitTargetOrientationLL(); | 1343 | LLQuaternion sitTargetOrient = prim.SitTargetOrientationLL; |
| 1343 | row["SitTargetOrientW"] = sitTargetOrient.W; | 1344 | row["SitTargetOrientW"] = sitTargetOrient.W; |
| 1344 | row["SitTargetOrientX"] = sitTargetOrient.X; | 1345 | row["SitTargetOrientX"] = sitTargetOrient.X; |
| 1345 | row["SitTargetOrientY"] = sitTargetOrient.Y; | 1346 | row["SitTargetOrientY"] = sitTargetOrient.Y; |