diff options
author | Melanie Thielker | 2008-09-08 02:40:20 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-08 02:40:20 +0000 |
commit | 490ac0be005a989c86ebde62aad137fd2da7cbd8 (patch) | |
tree | 0bd15a47dea6d2dea470d50779603970a0493fd9 /OpenSim/Data/SQLite | |
parent | Implement llEjectFromLand. (diff) | |
download | opensim-SC-490ac0be005a989c86ebde62aad137fd2da7cbd8.zip opensim-SC-490ac0be005a989c86ebde62aad137fd2da7cbd8.tar.gz opensim-SC-490ac0be005a989c86ebde62aad137fd2da7cbd8.tar.bz2 opensim-SC-490ac0be005a989c86ebde62aad137fd2da7cbd8.tar.xz |
Implement proper persistence of the following prim properties:
Floating text, Rotation, Texture animation, Particle System
This will make "Eye Candy" scripts work without modification in
XEngine. The use of the CHANGED_REGION_RESTART hack is no longer
needed. Implemented in MySQL only, hovertext also in SQLite.
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r-- | OpenSim/Data/SQLite/Resources/009_RegionStore.sql | 8 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLite/Resources/009_RegionStore.sql b/OpenSim/Data/SQLite/Resources/009_RegionStore.sql new file mode 100644 index 0000000..1f40548 --- /dev/null +++ b/OpenSim/Data/SQLite/Resources/009_RegionStore.sql | |||
@@ -0,0 +1,8 @@ | |||
1 | BEGIN; | ||
2 | |||
3 | ALTER TABLE prims ADD COLUMN ColorR integer not null default 0; | ||
4 | ALTER TABLE prims ADD COLUMN ColorG integer not null default 0; | ||
5 | ALTER TABLE prims ADD COLUMN ColorB integer not null default 0; | ||
6 | ALTER TABLE prims ADD COLUMN ColorA integer not null default 0; | ||
7 | |||
8 | COMMIT; | ||
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs index bb441f6..cfb2023 100644 --- a/OpenSim/Data/SQLite/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs | |||
@@ -31,6 +31,7 @@ using System.Data; | |||
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.Threading; | 33 | using System.Threading; |
34 | using System.Drawing; | ||
34 | using OpenMetaverse; | 35 | using OpenMetaverse; |
35 | using log4net; | 36 | using log4net; |
36 | using Mono.Data.SqliteClient; | 37 | using Mono.Data.SqliteClient; |
@@ -666,6 +667,10 @@ namespace OpenSim.Data.SQLite | |||
666 | createCol(prims, "SceneGroupID", typeof (String)); | 667 | createCol(prims, "SceneGroupID", typeof (String)); |
667 | // various text fields | 668 | // various text fields |
668 | createCol(prims, "Text", typeof (String)); | 669 | createCol(prims, "Text", typeof (String)); |
670 | createCol(prims, "ColorR", typeof (Int32)); | ||
671 | createCol(prims, "ColorG", typeof (Int32)); | ||
672 | createCol(prims, "ColorB", typeof (Int32)); | ||
673 | createCol(prims, "ColorA", typeof (Int32)); | ||
669 | createCol(prims, "Description", typeof (String)); | 674 | createCol(prims, "Description", typeof (String)); |
670 | createCol(prims, "SitName", typeof (String)); | 675 | createCol(prims, "SitName", typeof (String)); |
671 | createCol(prims, "TouchName", typeof (String)); | 676 | createCol(prims, "TouchName", typeof (String)); |
@@ -890,6 +895,10 @@ namespace OpenSim.Data.SQLite | |||
890 | prim.Name = (String) row["Name"]; | 895 | prim.Name = (String) row["Name"]; |
891 | // various text fields | 896 | // various text fields |
892 | prim.Text = (String) row["Text"]; | 897 | prim.Text = (String) row["Text"]; |
898 | prim.Color = Color.FromArgb(Convert.ToInt32(row["ColorA"]), | ||
899 | Convert.ToInt32(row["ColorR"]), | ||
900 | Convert.ToInt32(row["ColorG"]), | ||
901 | Convert.ToInt32(row["ColorB"])); | ||
893 | prim.Description = (String) row["Description"]; | 902 | prim.Description = (String) row["Description"]; |
894 | prim.SitName = (String) row["SitName"]; | 903 | prim.SitName = (String) row["SitName"]; |
895 | prim.TouchName = (String) row["TouchName"]; | 904 | prim.TouchName = (String) row["TouchName"]; |