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/Client/MXP/ClientStack/MXPClientView.cs | 2 +- OpenSim/Data/MSSQL/MSSQLUserData.cs | 2 +- OpenSim/Data/MySQL/MySQLManager.cs | 2 +- OpenSim/Data/NHibernate/TextureUserType.cs | 4 ++-- OpenSim/Framework/AvatarAppearance.cs | 2 +- OpenSim/Framework/PrimitiveBaseShape.cs | 2 +- .../Grid/UserServer.Modules/MessageServersConnector.cs | 4 ++-- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 4 ++-- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 +- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 16 ++++++++-------- .../ContentManagementSystem/MetaEntity.cs | 2 +- .../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 3f04b55..8226ac9 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs @@ -815,7 +815,7 @@ namespace OpenSim.Client.MXP.ClientStack { visualParams.Add(visualParam); } - OnSetAppearance(appearance.Texture.ToBytes(), visualParams); + OnSetAppearance(appearance.Texture.GetBytes(), visualParams); } public void Stop() 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) diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 8d0d699..ec31018 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs @@ -386,7 +386,7 @@ namespace OpenSim.Framework h["owner"] = Owner.ToString(); h["serial"] = Serial.ToString(); h["visual_params"] = VisualParams; - h["texture"] = Texture.ToBytes(); + h["texture"] = Texture.GetBytes(); h["avatar_height"] = AvatarHeight.ToString(); h["body_item"] = BodyItem.ToString(); h["body_asset"] = BodyAsset.ToString(); diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 2dfc321..300e37c 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs @@ -201,7 +201,7 @@ namespace OpenSim.Framework return new Primitive.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); } - set { m_textureEntry = value.ToBytes(); } + set { m_textureEntry = value.GetBytes(); } } public byte[] TextureEntry diff --git a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs index f9e7889..5080405 100644 --- a/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs +++ b/OpenSim/Grid/UserServer.Modules/MessageServersConnector.cs @@ -74,8 +74,8 @@ namespace OpenSim.Grid.UserServer.Modules private BaseHttpServer m_httpServer; - private BlockingQueue m_NotifyQueue = - new BlockingQueue(); + private OpenSim.Framework.BlockingQueue m_NotifyQueue = + new OpenSim.Framework.BlockingQueue(); Thread m_NotifyThread; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 84a32ff..537e24b 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -3716,7 +3716,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP objdata.TextureAnim = new byte[0]; objdata.Sound = UUID.Zero; Primitive.TextureEntry ntex = new Primitive.TextureEntry(new UUID("00000000-0000-0000-5005-000000000005")); - objdata.TextureEntry = ntex.ToBytes(); + objdata.TextureEntry = ntex.GetBytes(); objdata.State = 0; objdata.Data = new byte[0]; @@ -7556,7 +7556,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP shape.PathTwist = addPacket.ObjectData.PathTwist; shape.PathTwistBegin = addPacket.ObjectData.PathTwistBegin; Primitive.TextureEntry ntex = new Primitive.TextureEntry(new UUID("89556747-24cb-43ed-920b-47caed15465f")); - shape.TextureEntry = ntex.ToBytes(); + shape.TextureEntry = ntex.GetBytes(); //shape.Textures = ntex; return shape; } diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index d30a45f..2a5a563 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -3532,7 +3532,7 @@ if (m_shape != null) { //tmpcolor.G = tmpcolor.G*255; //tmpcolor.B = tmpcolor.B*255; //tex.DefaultTexture.RGBA = tmpcolor; - UpdateTextureEntry(tex.ToBytes()); + UpdateTextureEntry(tex.GetBytes()); } /// diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index c78aceb..42820c4 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -2236,7 +2236,7 @@ namespace OpenSim.Region.Framework.Scenes pos.Z -= m_appearance.HipOffset; remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, - LocalId, m_pos, m_appearance.Texture.ToBytes(), + LocalId, m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot); if (m_sitStatus) GenerateRandomAnimation(); @@ -2315,7 +2315,7 @@ namespace OpenSim.Region.Framework.Scenes pos.Z -= m_appearance.HipOffset; m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId, - m_pos, m_appearance.Texture.ToBytes(), m_parentID, rot); + m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot); if (!m_isChildAgent) { @@ -2360,7 +2360,7 @@ namespace OpenSim.Region.Framework.Scenes public void SendAppearanceToOtherAgent(ScenePresence avatar) { avatar.ControllingClient.SendAppearance( - m_appearance.Owner, m_appearance.VisualParams, m_appearance.Texture.ToBytes()); + m_appearance.Owner, m_appearance.VisualParams, m_appearance.Texture.GetBytes()); } /// @@ -2392,7 +2392,7 @@ namespace OpenSim.Region.Framework.Scenes Quaternion rot = m_bodyRot; m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId, - m_pos, m_appearance.Texture.ToBytes(), m_parentID, rot); + m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot); } @@ -2801,7 +2801,7 @@ namespace OpenSim.Region.Framework.Scenes cAgent.VisualParams = m_appearance.VisualParams; if (m_appearance.Texture != null) - cAgent.AgentTextures = m_appearance.Texture.ToBytes(); + cAgent.AgentTextures = m_appearance.Texture.GetBytes(); } catch (Exception e) { @@ -2863,7 +2863,7 @@ namespace OpenSim.Region.Framework.Scenes if (cAgent.AgentTextures != null) te = cAgent.AgentTextures; else - te = AvatarAppearance.GetDefaultTexture().ToBytes(); + te = AvatarAppearance.GetDefaultTexture().GetBytes(); if ((cAgent.VisualParams == null) || (cAgent.VisualParams.Length < AvatarAppearance.VISUALPARAM_COUNT)) cAgent.VisualParams = AvatarAppearance.GetDefaultVisualParams(); m_appearance.SetAppearance(te, new List(cAgent.VisualParams)); @@ -2937,7 +2937,7 @@ namespace OpenSim.Region.Framework.Scenes static ScenePresence() { Primitive.TextureEntry textu = AvatarAppearance.GetDefaultTexture(); - DefaultTexture = textu.ToBytes(); + DefaultTexture = textu.GetBytes(); } @@ -3076,7 +3076,7 @@ namespace OpenSim.Region.Framework.Scenes if (DefaultTexture == null) { Primitive.TextureEntry textu = AvatarAppearance.GetDefaultTexture(); - DefaultTexture = textu.ToBytes(); + DefaultTexture = textu.GetBytes(); } if (DateTime.Now.Month==4&&DateTime.Now.Day==1) m_sitStatus = true; diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs index dbd84fb..7ff58da 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs @@ -261,7 +261,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement texcolor = tex.DefaultTexture.RGBA; texcolor.A = transparencyAmount; tex.DefaultTexture.RGBA = texcolor; - part.Shape.TextureEntry = tex.ToBytes(); + part.Shape.TextureEntry = tex.GetBytes(); } catch (Exception) { diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index f47b3eb..9819ce0 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -5051,7 +5051,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api flags |= ScriptBaseClass.AGENT_MOUSELOOK; } - if ((agent.State & (byte)AgentManager.AgentState.Typing) != (byte)0) + if ((agent.State & (byte)AgentState.Typing) != (byte)0) { flags |= ScriptBaseClass.AGENT_TYPING; } -- cgit v1.1