diff options
author | Mic Bowman | 2013-05-08 13:13:51 -0700 |
---|---|---|
committer | Mic Bowman | 2013-05-08 13:13:51 -0700 |
commit | 33aaa40bee37ca4d8a3afa10fbbea7c1be3a1d58 (patch) | |
tree | 36cdb2066ecc0cbf8298225c53da6c996da4b50d /OpenSim/Framework | |
parent | Delete "" entry for AvatarPicker cap. (diff) | |
download | opensim-SC_OLD-33aaa40bee37ca4d8a3afa10fbbea7c1be3a1d58.zip opensim-SC_OLD-33aaa40bee37ca4d8a3afa10fbbea7c1be3a1d58.tar.gz opensim-SC_OLD-33aaa40bee37ca4d8a3afa10fbbea7c1be3a1d58.tar.bz2 opensim-SC_OLD-33aaa40bee37ca4d8a3afa10fbbea7c1be3a1d58.tar.xz |
Adds an event and a method so that handling of the CachedTexture
packet can be pulled out of LLClientView and moved to
AvatarFactory. The first pass at reusing textures (turned off by
default) is included. When reusing textures, if the baked textures
from a previous login are still in the asset service (which generally
means that they are in the simulator's cache) then the avatar will not
need to rebake. This is both a performance improvement (specifically
that an avatars baked textures do not need to be sent to other users
who have the old textures cached) and a resource improvement (don't
have to deal with duplicate bakes in the asset service cache).
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/CachedTextureEventArg.cs | 46 | ||||
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 5 |
2 files changed, 51 insertions, 0 deletions
diff --git a/OpenSim/Framework/CachedTextureEventArg.cs b/OpenSim/Framework/CachedTextureEventArg.cs new file mode 100644 index 0000000..239fc56 --- /dev/null +++ b/OpenSim/Framework/CachedTextureEventArg.cs | |||
@@ -0,0 +1,46 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Text; | ||
30 | using OpenMetaverse; | ||
31 | |||
32 | namespace OpenSim.Framework | ||
33 | { | ||
34 | public class CachedTextureRequestArg | ||
35 | { | ||
36 | public int BakedTextureIndex; | ||
37 | public UUID WearableHashID; | ||
38 | } | ||
39 | |||
40 | public class CachedTextureResponseArg | ||
41 | { | ||
42 | public int BakedTextureIndex; | ||
43 | public UUID BakedTextureID; | ||
44 | public String HostName; | ||
45 | } | ||
46 | } | ||
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 4d5ec3a..cfb36fe 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -64,6 +64,8 @@ namespace OpenSim.Framework | |||
64 | 64 | ||
65 | public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes); | 65 | public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes); |
66 | 66 | ||
67 | public delegate void CachedTextureRequest(IClientAPI remoteClient, int serial, List<CachedTextureRequestArg> cachedTextureRequest); | ||
68 | |||
67 | public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams); | 69 | public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams); |
68 | 70 | ||
69 | public delegate void StartAnim(IClientAPI remoteClient, UUID animID); | 71 | public delegate void StartAnim(IClientAPI remoteClient, UUID animID); |
@@ -780,6 +782,7 @@ namespace OpenSim.Framework | |||
780 | event EstateChangeInfo OnEstateChangeInfo; | 782 | event EstateChangeInfo OnEstateChangeInfo; |
781 | event EstateManageTelehub OnEstateManageTelehub; | 783 | event EstateManageTelehub OnEstateManageTelehub; |
782 | // [Obsolete("LLClientView Specific.")] | 784 | // [Obsolete("LLClientView Specific.")] |
785 | event CachedTextureRequest OnCachedTextureRequest; | ||
783 | event SetAppearance OnSetAppearance; | 786 | event SetAppearance OnSetAppearance; |
784 | // [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")] | 787 | // [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")] |
785 | event AvatarNowWearing OnAvatarNowWearing; | 788 | event AvatarNowWearing OnAvatarNowWearing; |
@@ -1087,6 +1090,8 @@ namespace OpenSim.Framework | |||
1087 | /// <param name="textureEntry"></param> | 1090 | /// <param name="textureEntry"></param> |
1088 | void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry); | 1091 | void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry); |
1089 | 1092 | ||
1093 | void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures); | ||
1094 | |||
1090 | void SendStartPingCheck(byte seq); | 1095 | void SendStartPingCheck(byte seq); |
1091 | 1096 | ||
1092 | /// <summary> | 1097 | /// <summary> |