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/Sirikata | |
| 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 '')
| -rw-r--r-- | OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | 2 |
1 files changed, 2 insertions, 0 deletions
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; |