5 files changed, 13 insertions, 13 deletions

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());
         }
 
         /// <summary>
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());
         }
 
         /// <summary>
@@ -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<byte>(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;
             }