aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Storage
diff options
context:
space:
mode:
authorlbsa712007-12-27 14:00:30 +0000
committerlbsa712007-12-27 14:00:30 +0000
commit87e2a694e200f5774f71d38041247912b5ccf98d (patch)
treee5669eb91e90e378442353242821ba3dad0f1ab2 /OpenSim/Region/Storage
parent* Fixed the matching logic error on the LLQuat to axiom quat :P (diff)
downloadopensim-SC_OLD-87e2a694e200f5774f71d38041247912b5ccf98d.zip
opensim-SC_OLD-87e2a694e200f5774f71d38041247912b5ccf98d.tar.gz
opensim-SC_OLD-87e2a694e200f5774f71d38041247912b5ccf98d.tar.bz2
opensim-SC_OLD-87e2a694e200f5774f71d38041247912b5ccf98d.tar.xz
* AssetServerBase: _ProcessRequest is now called GetAsset
* PrimitiveBaseShape: The textures are now exposed as a 'TextureEntry Textures'; all serialization still using the 'byte[] TextureEntry' for backwards compatibility. * Scene: Re-added AddTree, since the Tree type isn't gone from libsl, merely relocated.
Diffstat (limited to 'OpenSim/Region/Storage')
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs8
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs6
2 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
index 91edf5e..0a48126 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MSSQL/MSSQLDataStore.cs
@@ -634,9 +634,13 @@ namespace OpenSim.DataStore.MSSQL
634 s.ProfileEnd = Convert.ToUInt16(row["ProfileEnd"]); 634 s.ProfileEnd = Convert.ToUInt16(row["ProfileEnd"]);
635 s.ProfileCurve = Convert.ToByte(row["ProfileCurve"]); 635 s.ProfileCurve = Convert.ToByte(row["ProfileCurve"]);
636 s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]); 636 s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]);
637
637 // text TODO: this isn't right] = but I'm not sure the right 638 // text TODO: this isn't right] = but I'm not sure the right
638 // way to specify this as a blob atm 639 // way to specify this as a blob atm
639 s.TextureEntry = (byte[])row["Texture"]; 640 byte[] textureEntry = (byte[])row["Texture"];
641 s.TextureEntry = textureEntry;
642
643
640 s.ExtraParams = (byte[])row["ExtraParams"]; 644 s.ExtraParams = (byte[])row["ExtraParams"];
641 // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding(); 645 // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
642 // string texture = encoding.GetString((Byte[])row["Texture"]); 646 // string texture = encoding.GetString((Byte[])row["Texture"]);
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index 5bf4551..9118082 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -1014,7 +1014,11 @@ namespace OpenSim.DataStore.MonoSqlite
1014 s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]); 1014 s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]);
1015 // text TODO: this isn't right] = but I'm not sure the right 1015 // text TODO: this isn't right] = but I'm not sure the right
1016 // way to specify this as a blob atm 1016 // way to specify this as a blob atm
1017 s.TextureEntry = (byte[]) row["Texture"]; 1017
1018 byte[] textureEntry = (byte[])row["Texture"];
1019 s.TextureEntry = textureEntry;
1020
1021
1018 s.ExtraParams = (byte[]) row["ExtraParams"]; 1022 s.ExtraParams = (byte[]) row["ExtraParams"];
1019 // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding(); 1023 // System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
1020 // string texture = encoding.GetString((Byte[])row["Texture"]); 1024 // string texture = encoding.GetString((Byte[])row["Texture"]);