diff options
author | Melanie | 2013-07-24 04:45:07 +0100 |
---|---|---|
committer | Melanie | 2013-07-24 04:45:07 +0100 |
commit | e82d4154a2e348e4a38f01cb1877878c94569bba (patch) | |
tree | 7b27e6d30d04f6089fd17d5779cfb0a81e50d508 /OpenSim/Framework/IClientAPI.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess what... (diff) | |
download | opensim-SC_OLD-e82d4154a2e348e4a38f01cb1877878c94569bba.zip opensim-SC_OLD-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.gz opensim-SC_OLD-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.bz2 opensim-SC_OLD-e82d4154a2e348e4a38f01cb1877878c94569bba.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 6c9e7c9..22cc79d 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -834,6 +834,8 @@ namespace OpenSim.Framework | |||
834 | /// </remarks> | 834 | /// </remarks> |
835 | event UpdateAgent OnAgentUpdate; | 835 | event UpdateAgent OnAgentUpdate; |
836 | 836 | ||
837 | event UpdateAgent OnAgentCameraUpdate; | ||
838 | |||
837 | event AgentRequestSit OnAgentRequestSit; | 839 | event AgentRequestSit OnAgentRequestSit; |
838 | event AgentSit OnAgentSit; | 840 | event AgentSit OnAgentSit; |
839 | event AvatarPickerRequest OnAvatarPickerRequest; | 841 | event AvatarPickerRequest OnAvatarPickerRequest; |
@@ -1489,7 +1491,7 @@ namespace OpenSim.Framework | |||
1489 | void SendChangeUserRights(UUID agentID, UUID friendID, int rights); | 1491 | void SendChangeUserRights(UUID agentID, UUID friendID, int rights); |
1490 | void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId); | 1492 | void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId); |
1491 | 1493 | ||
1492 | void StopFlying(ISceneEntity presence); | 1494 | void SendAgentTerseUpdate(ISceneEntity presence); |
1493 | 1495 | ||
1494 | void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data); | 1496 | void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data); |
1495 | } | 1497 | } |