diff options
author | Mic Bowman | 2011-08-30 08:44:28 -0700 |
---|---|---|
committer | Mic Bowman | 2011-08-30 08:44:28 -0700 |
commit | 17dab7245fd3f132264fb4ae5e8e70ebdbde073b (patch) | |
tree | 4099256b83c94e9c568c316431ebc92a32a85241 /OpenSim/Region/Framework | |
parent | Use GetMeshKey from PrimitiveBaseShape. (diff) | |
parent | Fix bug in persisting saved appearances for npcs (diff) | |
download | opensim-SC-17dab7245fd3f132264fb4ae5e8e70ebdbde073b.zip opensim-SC-17dab7245fd3f132264fb4ae5e8e70ebdbde073b.tar.gz opensim-SC-17dab7245fd3f132264fb4ae5e8e70ebdbde073b.tar.bz2 opensim-SC-17dab7245fd3f132264fb4ae5e8e70ebdbde073b.tar.xz |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
2 files changed, 20 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs index 6817725..4dbddf4 100644 --- a/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs +++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections.Generic; | ||
28 | using OpenMetaverse; | 29 | using OpenMetaverse; |
29 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
30 | 31 | ||
@@ -39,7 +40,23 @@ namespace OpenSim.Region.Framework.Interfaces | |||
39 | /// <returns></returns> | 40 | /// <returns></returns> |
40 | bool SendAppearance(UUID agentId); | 41 | bool SendAppearance(UUID agentId); |
41 | 42 | ||
43 | /// <summary> | ||
44 | /// Return the baked texture ids of the given agent. | ||
45 | /// </summary> | ||
46 | /// <param name="agentId"></param> | ||
47 | /// <returns>An empty list if this agent has no baked textures (e.g. because it's a child agent)</returns> | ||
48 | Dictionary<BakeType, Primitive.TextureEntryFace> GetBakedTextureFaces(UUID agentId); | ||
49 | |||
50 | /// <summary> | ||
51 | /// Save the baked textures for the given agent permanently in the asset database. | ||
52 | /// </summary> | ||
53 | /// <remarks> | ||
54 | /// This is used to preserve apperance textures for NPCs | ||
55 | /// </remarks> | ||
56 | /// <param name="agentId"></param> | ||
57 | /// <returns>true if a valid agent was found, false otherwise</returns> | ||
42 | bool SaveBakedTextures(UUID agentId); | 58 | bool SaveBakedTextures(UUID agentId); |
59 | |||
43 | bool ValidateBakedTextureCache(IClientAPI client); | 60 | bool ValidateBakedTextureCache(IClientAPI client); |
44 | void QueueAppearanceSend(UUID agentid); | 61 | void QueueAppearanceSend(UUID agentid); |
45 | void QueueAppearanceSave(UUID agentid); | 62 | void QueueAppearanceSave(UUID agentid); |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 4148d4b..4143d44 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1695,9 +1695,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1695 | /// </param> | 1695 | /// </param> |
1696 | public void MoveToTarget(Vector3 pos, bool noFly) | 1696 | public void MoveToTarget(Vector3 pos, bool noFly) |
1697 | { | 1697 | { |
1698 | // m_log.DebugFormat( | 1698 | m_log.DebugFormat( |
1699 | // "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}", | 1699 | "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}", |
1700 | // Name, pos, m_scene.RegionInfo.RegionName); | 1700 | Name, pos, m_scene.RegionInfo.RegionName); |
1701 | 1701 | ||
1702 | if (pos.X < 0 || pos.X >= Constants.RegionSize | 1702 | if (pos.X < 0 || pos.X >= Constants.RegionSize |
1703 | || pos.Y < 0 || pos.Y >= Constants.RegionSize | 1703 | || pos.Y < 0 || pos.Y >= Constants.RegionSize |