diff options
author | MW | 2007-12-10 13:27:23 +0000 |
---|---|---|
committer | MW | 2007-12-10 13:27:23 +0000 |
commit | 611327e1040fa706665c543f67f9331a7e0136c5 (patch) | |
tree | 4426a50291dbc1c7c4ec065fd5c48921a767b658 /OpenSim/Region/Environment/Scenes | |
parent | added musings on llInstantMessage (diff) | |
download | opensim-SC_OLD-611327e1040fa706665c543f67f9331a7e0136c5.zip opensim-SC_OLD-611327e1040fa706665c543f67f9331a7e0136c5.tar.gz opensim-SC_OLD-611327e1040fa706665c543f67f9331a7e0136c5.tar.bz2 opensim-SC_OLD-611327e1040fa706665c543f67f9331a7e0136c5.tar.xz |
more work on texture downloading.
Refractored the TextureDownloadModule (but currently to make debugging easier, it is running as a non shared module, so this results in a instance of this module being created for each region (and a extra thread per region), this will be changed back soon.
Removed the old texture handling/sending code from AssetCache.
A few other small changes/fixes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs index 0f3bca1..b9d1232 100644 --- a/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs +++ b/OpenSim/Region/Environment/Scenes/IScenePresenceBody.cs | |||
@@ -35,8 +35,5 @@ namespace OpenSim.Region.Environment.Scenes | |||
35 | public interface IScenePresenceBody | 35 | public interface IScenePresenceBody |
36 | { | 36 | { |
37 | void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation); | 37 | void processMovement(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation); |
38 | void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam); | ||
39 | void SendOurAppearance(IClientAPI OurClient); | ||
40 | void SendAppearanceToOtherAgent(ScenePresence avatarInfo); | ||
41 | } | 38 | } |
42 | } \ No newline at end of file | 39 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index c5cb55c..e9d83a1 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1019,7 +1019,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1019 | ScenePresence avatar = null; | 1019 | ScenePresence avatar = null; |
1020 | 1020 | ||
1021 | AvatarAppearance appearance; | 1021 | AvatarAppearance appearance; |
1022 | LoadAvatarAppearance(client, out appearance); | 1022 | GetAvatarAppearance(client, out appearance); |
1023 | 1023 | ||
1024 | avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance); | 1024 | avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance); |
1025 | 1025 | ||
@@ -1031,7 +1031,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1031 | return avatar; | 1031 | return avatar; |
1032 | } | 1032 | } |
1033 | 1033 | ||
1034 | protected void LoadAvatarAppearance(IClientAPI client, out AvatarAppearance appearance) | 1034 | protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance) |
1035 | { | 1035 | { |
1036 | if (m_AvatarFactory == null || | 1036 | if (m_AvatarFactory == null || |
1037 | !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance)) | 1037 | !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance)) |