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/MXP/ClientStack/MXPClientView.cs | |
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/MXP/ClientStack/MXPClientView.cs')
-rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 1 |
1 files changed, 1 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; |