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 | |
| 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')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 2 |
3 files changed, 6 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; |
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs index 96a24c6..1bdc4f8 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
| @@ -338,6 +338,8 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
| 338 | public event UUIDNameRequest OnTeleportHomeRequest; | 338 | public event UUIDNameRequest OnTeleportHomeRequest; |
| 339 | public event ScriptAnswer OnScriptAnswer; | 339 | public event ScriptAnswer OnScriptAnswer; |
| 340 | public event AgentSit OnUndo; | 340 | public event AgentSit OnUndo; |
| 341 | public event AgentSit OnRedo; | ||
| 342 | public event LandUndo OnLandUndo; | ||
| 341 | public event ForceReleaseControls OnForceReleaseControls; | 343 | public event ForceReleaseControls OnForceReleaseControls; |
| 342 | public event GodLandStatRequest OnLandStatRequest; | 344 | public event GodLandStatRequest OnLandStatRequest; |
| 343 | public event DetailedEstateDataRequest OnDetailedEstateDataRequest; | 345 | public event DetailedEstateDataRequest OnDetailedEstateDataRequest; |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index cc4200c..f45cb44 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -343,6 +343,8 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 343 | public event UUIDNameRequest OnTeleportHomeRequest = delegate { }; | 343 | public event UUIDNameRequest OnTeleportHomeRequest = delegate { }; |
| 344 | public event ScriptAnswer OnScriptAnswer = delegate { }; | 344 | public event ScriptAnswer OnScriptAnswer = delegate { }; |
| 345 | public event AgentSit OnUndo = delegate { }; | 345 | public event AgentSit OnUndo = delegate { }; |
| 346 | public event AgentSit OnRedo = delegate { }; | ||
| 347 | public event LandUndo OnLandUndo = delegate { }; | ||
| 346 | public event ForceReleaseControls OnForceReleaseControls = delegate { }; | 348 | public event ForceReleaseControls OnForceReleaseControls = delegate { }; |
| 347 | public event GodLandStatRequest OnLandStatRequest = delegate { }; | 349 | public event GodLandStatRequest OnLandStatRequest = delegate { }; |
| 348 | public event DetailedEstateDataRequest OnDetailedEstateDataRequest = delegate { }; | 350 | public event DetailedEstateDataRequest OnDetailedEstateDataRequest = delegate { }; |