aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorMic Bowman2013-05-08 13:13:51 -0700
committerMic Bowman2013-05-08 13:13:51 -0700
commit33aaa40bee37ca4d8a3afa10fbbea7c1be3a1d58 (patch)
tree36cdb2066ecc0cbf8298225c53da6c996da4b50d /OpenSim/Region/OptionalModules
parentDelete "" entry for AvatarPicker cap. (diff)
downloadopensim-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 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs6
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs6
2 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 915ebd8..3644856 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -660,6 +660,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
660 public event BakeTerrain OnBakeTerrain; 660 public event BakeTerrain OnBakeTerrain;
661 public event EstateChangeInfo OnEstateChangeInfo; 661 public event EstateChangeInfo OnEstateChangeInfo;
662 public event EstateManageTelehub OnEstateManageTelehub; 662 public event EstateManageTelehub OnEstateManageTelehub;
663 public event CachedTextureRequest OnCachedTextureRequest;
663 public event SetAppearance OnSetAppearance; 664 public event SetAppearance OnSetAppearance;
664 public event AvatarNowWearing OnAvatarNowWearing; 665 public event AvatarNowWearing OnAvatarNowWearing;
665 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv; 666 public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
@@ -938,7 +939,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
938 { 939 {
939 940
940 } 941 }
942
943 public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures)
944 {
941 945
946 }
947
942 public void SendStartPingCheck(byte seq) 948 public void SendStartPingCheck(byte seq)
943 { 949 {
944 950
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 0ee00e9..8aae300 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -391,6 +391,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
391 public event EstateTeleportAllUsersHomeRequest OnEstateTeleportAllUsersHomeRequest; 391 public event EstateTeleportAllUsersHomeRequest OnEstateTeleportAllUsersHomeRequest;
392 public event EstateChangeInfo OnEstateChangeInfo; 392 public event EstateChangeInfo OnEstateChangeInfo;
393 public event EstateManageTelehub OnEstateManageTelehub; 393 public event EstateManageTelehub OnEstateManageTelehub;
394 public event CachedTextureRequest OnCachedTextureRequest;
394 public event ScriptReset OnScriptReset; 395 public event ScriptReset OnScriptReset;
395 public event GetScriptRunning OnGetScriptRunning; 396 public event GetScriptRunning OnGetScriptRunning;
396 public event SetScriptRunning OnSetScriptRunning; 397 public event SetScriptRunning OnSetScriptRunning;
@@ -569,6 +570,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
569 { 570 {
570 } 571 }
571 572
573 public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures)
574 {
575
576 }
577
572 public virtual void Kick(string message) 578 public virtual void Kick(string message)
573 { 579 {
574 } 580 }