diff options
| author | Melanie | 2010-08-26 23:39:20 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-26 23:39:20 +0100 |
| commit | 1f1d72eba5ca2b1e4115e93af1ed88950dce585a (patch) | |
| tree | 2dfcb626f9eb5fc6244b9fe7dac4b46a9c587703 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |
| parent | Send a null result search packet when no results are passsed in (diff) | |
| parent | More on mantis #4985 (diff) | |
| download | opensim-SC_OLD-1f1d72eba5ca2b1e4115e93af1ed88950dce585a.zip opensim-SC_OLD-1f1d72eba5ca2b1e4115e93af1ed88950dce585a.tar.gz opensim-SC_OLD-1f1d72eba5ca2b1e4115e93af1ed88950dce585a.tar.bz2 opensim-SC_OLD-1f1d72eba5ca2b1e4115e93af1ed88950dce585a.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index c675322..88e084e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
| @@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 70 | /// <summary> | 70 | /// <summary> |
| 71 | /// A user will arrive shortly, set up appropriate credentials so it can connect | 71 | /// A user will arrive shortly, set up appropriate credentials so it can connect |
| 72 | /// </summary> | 72 | /// </summary> |
| 73 | public event ExpectUserDelegate OnExpectUser; | 73 | // public event ExpectUserDelegate OnExpectUser; |
| 74 | 74 | ||
| 75 | /// <summary> | 75 | /// <summary> |
| 76 | /// A Prim will arrive shortly | 76 | /// A Prim will arrive shortly |
| @@ -80,7 +80,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 80 | /// <summary> | 80 | /// <summary> |
| 81 | /// A new prim has arrived | 81 | /// A new prim has arrived |
| 82 | /// </summary> | 82 | /// </summary> |
| 83 | public event PrimCrossing OnPrimCrossingIntoRegion; | 83 | // public event PrimCrossing OnPrimCrossingIntoRegion; |
| 84 | 84 | ||
| 85 | ///// <summary> | 85 | ///// <summary> |
| 86 | ///// A New Region is up and available | 86 | ///// A New Region is up and available |
| @@ -90,7 +90,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 90 | /// <summary> | 90 | /// <summary> |
| 91 | /// We have a child agent for this avatar and we're getting a status update about it | 91 | /// We have a child agent for this avatar and we're getting a status update about it |
| 92 | /// </summary> | 92 | /// </summary> |
| 93 | public event ChildAgentUpdate OnChildAgentUpdate; | 93 | // public event ChildAgentUpdate OnChildAgentUpdate; |
| 94 | //public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar; | 94 | //public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar; |
| 95 | 95 | ||
| 96 | /// <summary> | 96 | /// <summary> |