aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-16 03:02:28 +0100
committerJustin Clark-Casey (justincc)2011-07-16 03:02:28 +0100
commit3fc12e72245c81075fb7a584c40aa49a10a3b458 (patch)
tree3159fb068919db14003e830606fc5629c82ea29d /OpenSim
parentminor: remove mono compiler warnings (diff)
downloadopensim-SC_OLD-3fc12e72245c81075fb7a584c40aa49a10a3b458.zip
opensim-SC_OLD-3fc12e72245c81075fb7a584c40aa49a10a3b458.tar.gz
opensim-SC_OLD-3fc12e72245c81075fb7a584c40aa49a10a3b458.tar.bz2
opensim-SC_OLD-3fc12e72245c81075fb7a584c40aa49a10a3b458.tar.xz
Eliminate the pointless textured id argument to SculptTextureCallback
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs21
1 files changed, 6 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 96dc82b8..a55e07a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1731,7 +1731,7 @@ namespace OpenSim.Region.Framework.Scenes
1731 { 1731 {
1732 SceneObjectPart sop = (SceneObjectPart)sender; 1732 SceneObjectPart sop = (SceneObjectPart)sender;
1733 if (sop != null) 1733 if (sop != null)
1734 sop.SculptTextureCallback(asset.FullID, asset); 1734 sop.SculptTextureCallback(asset);
1735 } 1735 }
1736 } 1736 }
1737 1737
@@ -2979,11 +2979,10 @@ namespace OpenSim.Region.Framework.Scenes
2979 } 2979 }
2980 2980
2981 /// <summary> 2981 /// <summary>
2982 /// Sets sculpt and mesh data, and tells the physics engine to process the change. 2982 /// Set sculpt and mesh data, and tell the physics engine to process the change.
2983 /// </summary> 2983 /// </summary>
2984 /// <param name="textureID">Texture id of the mesh. XXX: Redundant since this is also in AssetBase</param>
2985 /// <param name="texture">The mesh itself.</param> 2984 /// <param name="texture">The mesh itself.</param>
2986 public void SculptTextureCallback(UUID textureID, AssetBase texture) 2985 public void SculptTextureCallback(AssetBase texture)
2987 { 2986 {
2988 if (m_shape.SculptEntry) 2987 if (m_shape.SculptEntry)
2989 { 2988 {
@@ -3009,16 +3008,6 @@ namespace OpenSim.Region.Framework.Scenes
3009 } 3008 }
3010 } 3009 }
3011 3010
3012// /// <summary>
3013// ///
3014// /// </summary>
3015// /// <param name="remoteClient"></param>
3016// public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags)
3017// {
3018// m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags);
3019// }
3020
3021
3022 /// <summary> 3011 /// <summary>
3023 /// Send a full update to the client for the given part 3012 /// Send a full update to the client for the given part
3024 /// </summary> 3013 /// </summary>
@@ -4631,9 +4620,11 @@ namespace OpenSim.Region.Framework.Scenes
4631 if (Shape.SculptEntry && Shape.SculptTexture != UUID.Zero) 4620 if (Shape.SculptEntry && Shape.SculptTexture != UUID.Zero)
4632 { 4621 {
4633 // check if a previously decoded sculpt map has been cached 4622 // check if a previously decoded sculpt map has been cached
4623 // We don't read the file here - the meshmerizer will do that later.
4624 // TODO: Could we simplify the meshmerizer code by reading and setting the data here?
4634 if (File.Exists(System.IO.Path.Combine("j2kDecodeCache", "smap_" + Shape.SculptTexture.ToString()))) 4625 if (File.Exists(System.IO.Path.Combine("j2kDecodeCache", "smap_" + Shape.SculptTexture.ToString())))
4635 { 4626 {
4636 SculptTextureCallback(Shape.SculptTexture, null); 4627 SculptTextureCallback(null);
4637 } 4628 }
4638 else 4629 else
4639 { 4630 {