ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 11:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Implement dynamic attribute persistence on mysql and mssql

Browse Source 
mssql is untested
This commit is contained in:
Justin Clark-Casey (justincc)
2010-08-16 21:57:08 +01:00
parent d3095e2649
commit a3e1e6dd61
4 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Data/MySQL/MySQLSimulationData.cs
View File

@@ -202,7 +202,7 @@ namespace OpenSim.Data.MySQL
"?SaleType, ?ColorR, ?ColorG, " +
"?ColorB, ?ColorA, ?ParticleSystem, " +
"?ClickAction, ?Material, ?CollisionSound, " +
"?CollisionSoundVolume, ?PassTouches, ?LinkNumber, ?MediaURL)";
"?CollisionSoundVolume, ?PassTouches, ?LinkNumber, ?MediaURL, ?DynAttrs)";
FillPrimCommand(cmd, prim, obj.UUID, regionUUID);
@@ -230,7 +230,7 @@ namespace OpenSim.Data.MySQL
"?PathTwistBegin, ?ProfileBegin, " +
"?ProfileEnd, ?ProfileCurve, " +
"?ProfileHollow, ?Texture, ?ExtraParams, " +
"?State, ?Media)";
"?State, ?Media, ?DynAttrs)";
FillShapeCommand(cmd, prim);
@@ -1291,6 +1291,11 @@ namespace OpenSim.Data.MySQL
if (!(row["MediaURL"] is System.DBNull))
prim.MediaUrl = (string)row["MediaURL"];
if (!(row["DynAttrs"] is System.DBNull))
prim.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]);
else
prim.DynAttrs = new DynAttrsOSDMap();
return prim;
}
@@ -1637,6 +1642,7 @@ namespace OpenSim.Data.MySQL
cmd.Parameters.AddWithValue("LinkNumber", prim.LinkNum);
cmd.Parameters.AddWithValue("MediaURL", prim.MediaUrl);
cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml());
}
/// <summary>
@@ -1829,6 +1835,11 @@ namespace OpenSim.Data.MySQL
if (!(row["Media"] is System.DBNull))
s.Media = PrimitiveBaseShape.MediaList.FromXml((string)row["Media"]);
if (!(row["DynAttrs"] is System.DBNull))
s.DynAttrs = DynAttrsOSDMap.FromXml((string)row["DynAttrs"]);
else
s.DynAttrs = new DynAttrsOSDMap();
return s;
}
@@ -1873,6 +1884,7 @@ namespace OpenSim.Data.MySQL
cmd.Parameters.AddWithValue("ExtraParams", s.ExtraParams);
cmd.Parameters.AddWithValue("State", s.State);
cmd.Parameters.AddWithValue("Media", null == s.Media ? null : s.Media.ToXml());
cmd.Parameters.AddWithValue("DynAttrs", s.DynAttrs.ToXml());
}
public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)

9
OpenSim/Data/MySQL/Resources/RegionStore.migrations
View File

@@ -902,3 +902,12 @@ BEGIN;
CREATE TABLE `regionextra` (`RegionID` char(36) not null, `Name` varchar(32) not null, `value` text, primary key(`RegionID`, `Name`));
COMMIT;
:VERSION 46 #---------------- Dynamic attributes
BEGIN;
ALTER TABLE prims ADD COLUMN DynAttrs TEXT;
ALTER TABLE primshapes ADD COLUMN DynAttrs TEXT;
COMMIT;