diff options
| author | Adam Frisby | 2009-08-16 21:21:38 +1000 |
|---|---|---|
| committer | Adam Frisby | 2009-08-16 21:21:38 +1000 |
| commit | aea4d7c63b64ee06e51725acb6d1e48c971b26d8 (patch) | |
| tree | f2be39d773040ea117f194f2a341e1df0adc2c60 /OpenSim/Client | |
| parent | * [MRM] Implements permission checks on IObject implementations in SOPObject.... (diff) | |
| parent | Add copyright headers. Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-aea4d7c63b64ee06e51725acb6d1e48c971b26d8.zip opensim-SC_OLD-aea4d7c63b64ee06e51725acb6d1e48c971b26d8.tar.gz opensim-SC_OLD-aea4d7c63b64ee06e51725acb6d1e48c971b26d8.tar.bz2 opensim-SC_OLD-aea4d7c63b64ee06e51725acb6d1e48c971b26d8.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Client')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index a7bcc07..104f2d5 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -612,6 +612,7 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 612 | public event SpinStop OnSpinStop; | 612 | public event SpinStop OnSpinStop; |
| 613 | public event UpdateShape OnUpdatePrimShape; | 613 | public event UpdateShape OnUpdatePrimShape; |
| 614 | public event ObjectExtraParams OnUpdateExtraParams; | 614 | public event ObjectExtraParams OnUpdateExtraParams; |
| 615 | public event ObjectRequest OnObjectRequest; | ||
| 615 | public event ObjectSelect OnObjectSelect; | 616 | public event ObjectSelect OnObjectSelect; |
| 616 | public event ObjectDeselect OnObjectDeselect; | 617 | public event ObjectDeselect OnObjectDeselect; |
| 617 | public event GenericCall7 OnObjectDescription; | 618 | public event GenericCall7 OnObjectDescription; |
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs index 324b5af..bfca954 100644 --- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs +++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | |||
| @@ -259,6 +259,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack | |||
| 259 | public event SpinStop OnSpinStop = delegate { }; | 259 | public event SpinStop OnSpinStop = delegate { }; |
| 260 | public event UpdateShape OnUpdatePrimShape = delegate { }; | 260 | public event UpdateShape OnUpdatePrimShape = delegate { }; |
| 261 | public event ObjectExtraParams OnUpdateExtraParams = delegate { }; | 261 | public event ObjectExtraParams OnUpdateExtraParams = delegate { }; |
| 262 | public event ObjectRequest OnObjectRequest = delegate { }; | ||
| 262 | public event ObjectSelect OnObjectSelect = delegate { }; | 263 | public event ObjectSelect OnObjectSelect = delegate { }; |
| 263 | public event ObjectDeselect OnObjectDeselect = delegate { }; | 264 | public event ObjectDeselect OnObjectDeselect = delegate { }; |
| 264 | public event GenericCall7 OnObjectDescription = delegate { }; | 265 | public event GenericCall7 OnObjectDescription = delegate { }; |