diff options
author | lbsa71 | 2007-12-27 14:00:30 +0000 |
---|---|---|
committer | lbsa71 | 2007-12-27 14:00:30 +0000 |
commit | 87e2a694e200f5774f71d38041247912b5ccf98d (patch) | |
tree | e5669eb91e90e378442353242821ba3dad0f1ab2 /OpenSim/Framework/Data.MySQL | |
parent | * Fixed the matching logic error on the LLQuat to axiom quat :P (diff) | |
download | opensim-SC-87e2a694e200f5774f71d38041247912b5ccf98d.zip opensim-SC-87e2a694e200f5774f71d38041247912b5ccf98d.tar.gz opensim-SC-87e2a694e200f5774f71d38041247912b5ccf98d.tar.bz2 opensim-SC-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/Framework/Data.MySQL')
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs index 61b22a0..06a5814 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs | |||
@@ -916,7 +916,10 @@ namespace OpenSim.Framework.Data.MySQL | |||
916 | s.ProfileEnd = Convert.ToUInt16(row["ProfileEnd"]); | 916 | s.ProfileEnd = Convert.ToUInt16(row["ProfileEnd"]); |
917 | s.ProfileCurve = Convert.ToByte(row["ProfileCurve"]); | 917 | s.ProfileCurve = Convert.ToByte(row["ProfileCurve"]); |
918 | s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]); | 918 | s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]); |
919 | s.TextureEntry = (byte[])row["Texture"]; | 919 | |
920 | byte[] textureEntry = (byte[])row["Texture"]; | ||
921 | s.TextureEntry = textureEntry; | ||
922 | |||
920 | s.ExtraParams = (byte[])row["ExtraParams"]; | 923 | s.ExtraParams = (byte[])row["ExtraParams"]; |
921 | 924 | ||
922 | return s; | 925 | return s; |