diff options
| author | Teravus Ovares | 2008-09-09 23:42:44 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2008-09-09 23:42:44 +0000 |
| commit | fac18f608deadb0acee380e9d704955af4e466bb (patch) | |
| tree | 441c9c4a80f5210653b2eab091d6951c06879154 | |
| parent | possible fix for EARTH SHATTERING KABOOM! when trying to save a prim (diff) | |
| download | opensim-SC-fac18f608deadb0acee380e9d704955af4e466bb.zip opensim-SC-fac18f608deadb0acee380e9d704955af4e466bb.tar.gz opensim-SC-fac18f608deadb0acee380e9d704955af4e466bb.tar.bz2 opensim-SC-fac18f608deadb0acee380e9d704955af4e466bb.tar.xz | |
* Fixes Sqlite crash bug when saving a prim.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index 2c2a7e4..72bc2f9 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
| @@ -989,7 +989,8 @@ namespace OpenSim.Data.SQLite | |||
| 989 | new SqliteCommand("ALTER TABLE prims ADD COLUMN SitTargetOrientZ float NOT NULL default 0;", m_conn); | 989 | new SqliteCommand("ALTER TABLE prims ADD COLUMN SitTargetOrientZ float NOT NULL default 0;", m_conn); |
| 990 | cmd.ExecuteNonQuery(); | 990 | cmd.ExecuteNonQuery(); |
| 991 | } | 991 | } |
| 992 | 992 | prim.Color = Color.FromArgb(Convert.ToInt32(row["ColorR"]), Convert.ToInt32(row["ColorB"]), Convert.ToInt32(row["ColorG"])); | |
| 993 | |||
| 993 | return prim; | 994 | return prim; |
| 994 | } | 995 | } |
| 995 | 996 | ||
| @@ -1234,6 +1235,10 @@ namespace OpenSim.Data.SQLite | |||
| 1234 | row["SitTargetOrientX"] = sitTargetOrient.X; | 1235 | row["SitTargetOrientX"] = sitTargetOrient.X; |
| 1235 | row["SitTargetOrientY"] = sitTargetOrient.Y; | 1236 | row["SitTargetOrientY"] = sitTargetOrient.Y; |
| 1236 | row["SitTargetOrientZ"] = sitTargetOrient.Z; | 1237 | row["SitTargetOrientZ"] = sitTargetOrient.Z; |
| 1238 | row["ColorR"] = Convert.ToInt32(prim.Color.R); | ||
| 1239 | row["ColorG"] = Convert.ToInt32(prim.Color.G); | ||
| 1240 | row["ColorB"] = Convert.ToInt32(prim.Color.B); | ||
| 1241 | row["ColorA"] = Convert.ToInt32(prim.Color.A); | ||
| 1237 | } | 1242 | } |
| 1238 | 1243 | ||
| 1239 | /// <summary> | 1244 | /// <summary> |