From 52c482a7a7b297715cbcd7460edb1ad07d7a06c6 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Fri, 27 Mar 2009 22:13:09 +0000 Subject: * This updates LibOMV to the current release 0.6.0 on March 19 2009 * Important: HttpServer.dll was changed to HttpServer_OpenSim.dll so that the HttpServer references do not conflict if you've copied the OpenMetaverse.Http.dll and requirements to the OpenSimulator bin folder. This means that if you reference HttpServer.dll in any projects, you will need to change the reference to HttpServer_OpenSim.dll. It still uses the Same HttpServer namespace though. --- OpenSim/Data/MSSQL/MSSQLUserData.cs | 2 +- OpenSim/Data/MySQL/MySQLManager.cs | 2 +- OpenSim/Data/NHibernate/TextureUserType.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'OpenSim/Data') diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs index e0db622..379b8bf 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs @@ -597,7 +597,7 @@ namespace OpenSim.Data.MSSQL cmd.Parameters.Add(database.CreateParameter("@owner", appearance.Owner)); cmd.Parameters.Add(database.CreateParameter("@serial", appearance.Serial)); cmd.Parameters.Add(database.CreateParameter("@visual_params", appearance.VisualParams)); - cmd.Parameters.Add(database.CreateParameter("@texture", appearance.Texture.ToBytes())); + cmd.Parameters.Add(database.CreateParameter("@texture", appearance.Texture.GetBytes())); cmd.Parameters.Add(database.CreateParameter("@avatar_height", appearance.AvatarHeight)); cmd.Parameters.Add(database.CreateParameter("@body_item", appearance.BodyItem)); cmd.Parameters.Add(database.CreateParameter("@body_asset", appearance.BodyAsset)); diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs index 2f14f16..ad022a5 100644 --- a/OpenSim/Data/MySQL/MySQLManager.cs +++ b/OpenSim/Data/MySQL/MySQLManager.cs @@ -1171,7 +1171,7 @@ namespace OpenSim.Data.MySQL cmd.Parameters.AddWithValue("?owner", appearance.Owner.ToString()); cmd.Parameters.AddWithValue("?serial", appearance.Serial); cmd.Parameters.AddWithValue("?visual_params", appearance.VisualParams); - cmd.Parameters.AddWithValue("?texture", appearance.Texture.ToBytes()); + cmd.Parameters.AddWithValue("?texture", appearance.Texture.GetBytes()); cmd.Parameters.AddWithValue("?avatar_height", appearance.AvatarHeight); cmd.Parameters.AddWithValue("?body_item", appearance.BodyItem.ToString()); cmd.Parameters.AddWithValue("?body_asset", appearance.BodyAsset.ToString()); diff --git a/OpenSim/Data/NHibernate/TextureUserType.cs b/OpenSim/Data/NHibernate/TextureUserType.cs index 57a580d..8da32ac 100644 --- a/OpenSim/Data/NHibernate/TextureUserType.cs +++ b/OpenSim/Data/NHibernate/TextureUserType.cs @@ -57,7 +57,7 @@ namespace OpenSim.Data.NHibernate } else { - byte[] bytes = ((Primitive.TextureEntry)texture).ToBytes(); + byte[] bytes = ((Primitive.TextureEntry)texture).GetBytes(); return new Primitive.TextureEntry(bytes, 0, bytes.Length); } } @@ -94,7 +94,7 @@ namespace OpenSim.Data.NHibernate public void NullSafeSet(IDbCommand cmd, object obj, int index) { Primitive.TextureEntry texture = (Primitive.TextureEntry)obj; - ((IDataParameter)cmd.Parameters[index]).Value = texture.ToBytes(); + ((IDataParameter)cmd.Parameters[index]).Value = texture.GetBytes(); } public object Replace(object original, object target, object owner) -- cgit v1.1