diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
| commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
| tree | 756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Client/VWoHTTP/ClientStack | |
| parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
| parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
| download | opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz | |
*remove conflicts
Diffstat (limited to 'OpenSim/Client/VWoHTTP/ClientStack')
| -rw-r--r-- | OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs | 1 |
1 files changed, 1 insertions, 0 deletions
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 { }; |