diff options
author | Melanie | 2013-05-08 21:51:48 +0100 |
---|---|---|
committer | Melanie | 2013-05-08 21:51:48 +0100 |
commit | cdaceea5a633683c713f084d9beb93a14061772f (patch) | |
tree | 66798e45deff0d13e78740130dde68955a3ba86c /OpenSim/Region/OptionalModules/World/NPC | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Guard the scene list when estates are updated (diff) | |
download | opensim-SC_OLD-cdaceea5a633683c713f084d9beb93a14061772f.zip opensim-SC_OLD-cdaceea5a633683c713f084d9beb93a14061772f.tar.gz opensim-SC_OLD-cdaceea5a633683c713f084d9beb93a14061772f.tar.bz2 opensim-SC_OLD-cdaceea5a633683c713f084d9beb93a14061772f.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 7918c22..d1bb547 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -393,6 +393,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
393 | public event EstateTeleportAllUsersHomeRequest OnEstateTeleportAllUsersHomeRequest; | 393 | public event EstateTeleportAllUsersHomeRequest OnEstateTeleportAllUsersHomeRequest; |
394 | public event EstateChangeInfo OnEstateChangeInfo; | 394 | public event EstateChangeInfo OnEstateChangeInfo; |
395 | public event EstateManageTelehub OnEstateManageTelehub; | 395 | public event EstateManageTelehub OnEstateManageTelehub; |
396 | public event CachedTextureRequest OnCachedTextureRequest; | ||
396 | public event ScriptReset OnScriptReset; | 397 | public event ScriptReset OnScriptReset; |
397 | public event GetScriptRunning OnGetScriptRunning; | 398 | public event GetScriptRunning OnGetScriptRunning; |
398 | public event SetScriptRunning OnSetScriptRunning; | 399 | public event SetScriptRunning OnSetScriptRunning; |
@@ -573,6 +574,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
573 | { | 574 | { |
574 | } | 575 | } |
575 | 576 | ||
577 | public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures) | ||
578 | { | ||
579 | |||
580 | } | ||
581 | |||
576 | public virtual void Kick(string message) | 582 | public virtual void Kick(string message) |
577 | { | 583 | { |
578 | } | 584 | } |