diff options
author | Kitto Flora | 2010-03-12 13:48:31 -0500 |
---|---|---|
committer | Kitto Flora | 2010-03-12 13:48:31 -0500 |
commit | 7bd48d383d3383c1e633f76f76a5291f4224d48a (patch) | |
tree | 18997a5b1a123091af18a1a7984d7dd7873930ac /OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |
parent | Dynamics Integration Part 1 (diff) | |
parent | Small consistency change (diff) | |
download | opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.zip opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.gz opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.bz2 opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.xz |
Resolved merge
Diffstat (limited to 'OpenSim/Client/MXP/ClientStack/MXPClientView.cs')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 1d9586e..33017d6 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -692,6 +692,8 @@ namespace OpenSim.Client.MXP.ClientStack | |||
692 | public event UUIDNameRequest OnTeleportHomeRequest; | 692 | public event UUIDNameRequest OnTeleportHomeRequest; |
693 | public event ScriptAnswer OnScriptAnswer; | 693 | public event ScriptAnswer OnScriptAnswer; |
694 | public event AgentSit OnUndo; | 694 | public event AgentSit OnUndo; |
695 | public event AgentSit OnRedo; | ||
696 | public event LandUndo OnLandUndo; | ||
695 | public event ForceReleaseControls OnForceReleaseControls; | 697 | public event ForceReleaseControls OnForceReleaseControls; |
696 | public event GodLandStatRequest OnLandStatRequest; | 698 | public event GodLandStatRequest OnLandStatRequest; |
697 | public event DetailedEstateDataRequest OnDetailedEstateDataRequest; | 699 | public event DetailedEstateDataRequest OnDetailedEstateDataRequest; |