aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorTeravus Ovares2009-03-27 22:13:09 +0000
committerTeravus Ovares2009-03-27 22:13:09 +0000
commit52c482a7a7b297715cbcd7460edb1ad07d7a06c6 (patch)
tree67fbfb7d080f5c6d5575c1be39d8c92a46ab6360 /OpenSim/Data
parent* refactor: call some EventManager triggers directly rather than through scene (diff)
downloadopensim-SC_OLD-52c482a7a7b297715cbcd7460edb1ad07d7a06c6.zip
opensim-SC_OLD-52c482a7a7b297715cbcd7460edb1ad07d7a06c6.tar.gz
opensim-SC_OLD-52c482a7a7b297715cbcd7460edb1ad07d7a06c6.tar.bz2
opensim-SC_OLD-52c482a7a7b297715cbcd7460edb1ad07d7a06c6.tar.xz
* 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.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs2
-rw-r--r--OpenSim/Data/NHibernate/TextureUserType.cs4
3 files changed, 4 insertions, 4 deletions
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
597 cmd.Parameters.Add(database.CreateParameter("@owner", appearance.Owner)); 597 cmd.Parameters.Add(database.CreateParameter("@owner", appearance.Owner));
598 cmd.Parameters.Add(database.CreateParameter("@serial", appearance.Serial)); 598 cmd.Parameters.Add(database.CreateParameter("@serial", appearance.Serial));
599 cmd.Parameters.Add(database.CreateParameter("@visual_params", appearance.VisualParams)); 599 cmd.Parameters.Add(database.CreateParameter("@visual_params", appearance.VisualParams));
600 cmd.Parameters.Add(database.CreateParameter("@texture", appearance.Texture.ToBytes())); 600 cmd.Parameters.Add(database.CreateParameter("@texture", appearance.Texture.GetBytes()));
601 cmd.Parameters.Add(database.CreateParameter("@avatar_height", appearance.AvatarHeight)); 601 cmd.Parameters.Add(database.CreateParameter("@avatar_height", appearance.AvatarHeight));
602 cmd.Parameters.Add(database.CreateParameter("@body_item", appearance.BodyItem)); 602 cmd.Parameters.Add(database.CreateParameter("@body_item", appearance.BodyItem));
603 cmd.Parameters.Add(database.CreateParameter("@body_asset", appearance.BodyAsset)); 603 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
1171 cmd.Parameters.AddWithValue("?owner", appearance.Owner.ToString()); 1171 cmd.Parameters.AddWithValue("?owner", appearance.Owner.ToString());
1172 cmd.Parameters.AddWithValue("?serial", appearance.Serial); 1172 cmd.Parameters.AddWithValue("?serial", appearance.Serial);
1173 cmd.Parameters.AddWithValue("?visual_params", appearance.VisualParams); 1173 cmd.Parameters.AddWithValue("?visual_params", appearance.VisualParams);
1174 cmd.Parameters.AddWithValue("?texture", appearance.Texture.ToBytes()); 1174 cmd.Parameters.AddWithValue("?texture", appearance.Texture.GetBytes());
1175 cmd.Parameters.AddWithValue("?avatar_height", appearance.AvatarHeight); 1175 cmd.Parameters.AddWithValue("?avatar_height", appearance.AvatarHeight);
1176 cmd.Parameters.AddWithValue("?body_item", appearance.BodyItem.ToString()); 1176 cmd.Parameters.AddWithValue("?body_item", appearance.BodyItem.ToString());
1177 cmd.Parameters.AddWithValue("?body_asset", appearance.BodyAsset.ToString()); 1177 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
57 } 57 }
58 else 58 else
59 { 59 {
60 byte[] bytes = ((Primitive.TextureEntry)texture).ToBytes(); 60 byte[] bytes = ((Primitive.TextureEntry)texture).GetBytes();
61 return new Primitive.TextureEntry(bytes, 0, bytes.Length); 61 return new Primitive.TextureEntry(bytes, 0, bytes.Length);
62 } 62 }
63 } 63 }
@@ -94,7 +94,7 @@ namespace OpenSim.Data.NHibernate
94 public void NullSafeSet(IDbCommand cmd, object obj, int index) 94 public void NullSafeSet(IDbCommand cmd, object obj, int index)
95 { 95 {
96 Primitive.TextureEntry texture = (Primitive.TextureEntry)obj; 96 Primitive.TextureEntry texture = (Primitive.TextureEntry)obj;
97 ((IDataParameter)cmd.Parameters[index]).Value = texture.ToBytes(); 97 ((IDataParameter)cmd.Parameters[index]).Value = texture.GetBytes();
98 } 98 }
99 99
100 public object Replace(object original, object target, object owner) 100 public object Replace(object original, object target, object owner)