diff options
author | Teravus Ovares | 2009-03-27 22:13:09 +0000 |
---|---|---|
committer | Teravus Ovares | 2009-03-27 22:13:09 +0000 |
commit | 52c482a7a7b297715cbcd7460edb1ad07d7a06c6 (patch) | |
tree | 67fbfb7d080f5c6d5575c1be39d8c92a46ab6360 /OpenSim/Region/Framework | |
parent | * refactor: call some EventManager triggers directly rather than through scene (diff) | |
download | opensim-SC-52c482a7a7b297715cbcd7460edb1ad07d7a06c6.zip opensim-SC-52c482a7a7b297715cbcd7460edb1ad07d7a06c6.tar.gz opensim-SC-52c482a7a7b297715cbcd7460edb1ad07d7a06c6.tar.bz2 opensim-SC-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 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 16 |
2 files changed, 9 insertions, 9 deletions
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) { | |||
3532 | //tmpcolor.G = tmpcolor.G*255; | 3532 | //tmpcolor.G = tmpcolor.G*255; |
3533 | //tmpcolor.B = tmpcolor.B*255; | 3533 | //tmpcolor.B = tmpcolor.B*255; |
3534 | //tex.DefaultTexture.RGBA = tmpcolor; | 3534 | //tex.DefaultTexture.RGBA = tmpcolor; |
3535 | UpdateTextureEntry(tex.ToBytes()); | 3535 | UpdateTextureEntry(tex.GetBytes()); |
3536 | } | 3536 | } |
3537 | 3537 | ||
3538 | /// <summary> | 3538 | /// <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 | |||
2236 | pos.Z -= m_appearance.HipOffset; | 2236 | pos.Z -= m_appearance.HipOffset; |
2237 | 2237 | ||
2238 | remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, | 2238 | remoteAvatar.m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, |
2239 | LocalId, m_pos, m_appearance.Texture.ToBytes(), | 2239 | LocalId, m_pos, m_appearance.Texture.GetBytes(), |
2240 | m_parentID, rot); | 2240 | m_parentID, rot); |
2241 | if (m_sitStatus) | 2241 | if (m_sitStatus) |
2242 | GenerateRandomAnimation(); | 2242 | GenerateRandomAnimation(); |
@@ -2315,7 +2315,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2315 | pos.Z -= m_appearance.HipOffset; | 2315 | pos.Z -= m_appearance.HipOffset; |
2316 | 2316 | ||
2317 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId, | 2317 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId, |
2318 | m_pos, m_appearance.Texture.ToBytes(), m_parentID, rot); | 2318 | m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot); |
2319 | 2319 | ||
2320 | if (!m_isChildAgent) | 2320 | if (!m_isChildAgent) |
2321 | { | 2321 | { |
@@ -2360,7 +2360,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2360 | public void SendAppearanceToOtherAgent(ScenePresence avatar) | 2360 | public void SendAppearanceToOtherAgent(ScenePresence avatar) |
2361 | { | 2361 | { |
2362 | avatar.ControllingClient.SendAppearance( | 2362 | avatar.ControllingClient.SendAppearance( |
2363 | m_appearance.Owner, m_appearance.VisualParams, m_appearance.Texture.ToBytes()); | 2363 | m_appearance.Owner, m_appearance.VisualParams, m_appearance.Texture.GetBytes()); |
2364 | } | 2364 | } |
2365 | 2365 | ||
2366 | /// <summary> | 2366 | /// <summary> |
@@ -2392,7 +2392,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2392 | 2392 | ||
2393 | Quaternion rot = m_bodyRot; | 2393 | Quaternion rot = m_bodyRot; |
2394 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId, | 2394 | m_controllingClient.SendAvatarData(m_regionInfo.RegionHandle, m_firstname, m_lastname, m_grouptitle, m_uuid, LocalId, |
2395 | m_pos, m_appearance.Texture.ToBytes(), m_parentID, rot); | 2395 | m_pos, m_appearance.Texture.GetBytes(), m_parentID, rot); |
2396 | 2396 | ||
2397 | } | 2397 | } |
2398 | 2398 | ||
@@ -2801,7 +2801,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2801 | cAgent.VisualParams = m_appearance.VisualParams; | 2801 | cAgent.VisualParams = m_appearance.VisualParams; |
2802 | 2802 | ||
2803 | if (m_appearance.Texture != null) | 2803 | if (m_appearance.Texture != null) |
2804 | cAgent.AgentTextures = m_appearance.Texture.ToBytes(); | 2804 | cAgent.AgentTextures = m_appearance.Texture.GetBytes(); |
2805 | } | 2805 | } |
2806 | catch (Exception e) | 2806 | catch (Exception e) |
2807 | { | 2807 | { |
@@ -2863,7 +2863,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2863 | if (cAgent.AgentTextures != null) | 2863 | if (cAgent.AgentTextures != null) |
2864 | te = cAgent.AgentTextures; | 2864 | te = cAgent.AgentTextures; |
2865 | else | 2865 | else |
2866 | te = AvatarAppearance.GetDefaultTexture().ToBytes(); | 2866 | te = AvatarAppearance.GetDefaultTexture().GetBytes(); |
2867 | if ((cAgent.VisualParams == null) || (cAgent.VisualParams.Length < AvatarAppearance.VISUALPARAM_COUNT)) | 2867 | if ((cAgent.VisualParams == null) || (cAgent.VisualParams.Length < AvatarAppearance.VISUALPARAM_COUNT)) |
2868 | cAgent.VisualParams = AvatarAppearance.GetDefaultVisualParams(); | 2868 | cAgent.VisualParams = AvatarAppearance.GetDefaultVisualParams(); |
2869 | m_appearance.SetAppearance(te, new List<byte>(cAgent.VisualParams)); | 2869 | m_appearance.SetAppearance(te, new List<byte>(cAgent.VisualParams)); |
@@ -2937,7 +2937,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2937 | static ScenePresence() | 2937 | static ScenePresence() |
2938 | { | 2938 | { |
2939 | Primitive.TextureEntry textu = AvatarAppearance.GetDefaultTexture(); | 2939 | Primitive.TextureEntry textu = AvatarAppearance.GetDefaultTexture(); |
2940 | DefaultTexture = textu.ToBytes(); | 2940 | DefaultTexture = textu.GetBytes(); |
2941 | 2941 | ||
2942 | } | 2942 | } |
2943 | 2943 | ||
@@ -3076,7 +3076,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3076 | if (DefaultTexture == null) | 3076 | if (DefaultTexture == null) |
3077 | { | 3077 | { |
3078 | Primitive.TextureEntry textu = AvatarAppearance.GetDefaultTexture(); | 3078 | Primitive.TextureEntry textu = AvatarAppearance.GetDefaultTexture(); |
3079 | DefaultTexture = textu.ToBytes(); | 3079 | DefaultTexture = textu.GetBytes(); |
3080 | } | 3080 | } |
3081 | if (DateTime.Now.Month==4&&DateTime.Now.Day==1) | 3081 | if (DateTime.Now.Month==4&&DateTime.Now.Day==1) |
3082 | m_sitStatus = true; | 3082 | m_sitStatus = true; |