diff options
| author | Melanie | 2010-02-15 00:20:48 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-15 00:20:48 +0000 |
| commit | c033223c63274ebe41075b24d108ca952fbd242c (patch) | |
| tree | 8c969a9643c469feb37133b175be18eb52fdff49 /OpenSim/Client/Sirikata | |
| parent | Extraneous debug messages removed (diff) | |
| parent | Plug a small hole (diff) | |
| download | opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.zip opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.gz opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.bz2 opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Client/Sirikata')
| -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 dda95a1..208065c 100644 --- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs +++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs | |||
| @@ -343,6 +343,8 @@ namespace OpenSim.Client.Sirikata.ClientStack | |||
| 343 | public event UUIDNameRequest OnTeleportHomeRequest; | 343 | public event UUIDNameRequest OnTeleportHomeRequest; |
| 344 | public event ScriptAnswer OnScriptAnswer; | 344 | public event ScriptAnswer OnScriptAnswer; |
| 345 | public event AgentSit OnUndo; | 345 | public event AgentSit OnUndo; |
| 346 | public event AgentSit OnRedo; | ||
| 347 | public event LandUndo OnLandUndo; | ||
| 346 | public event ForceReleaseControls OnForceReleaseControls; | 348 | public event ForceReleaseControls OnForceReleaseControls; |
| 347 | public event GodLandStatRequest OnLandStatRequest; | 349 | public event GodLandStatRequest OnLandStatRequest; |
| 348 | public event DetailedEstateDataRequest OnDetailedEstateDataRequest; | 350 | public event DetailedEstateDataRequest OnDetailedEstateDataRequest; |