Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

author: Melanie 2010-03-04 10:43:12 +0000
committer: Melanie 2010-03-04 10:43:12 +0000
commit: 31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca (patch)
tree: e351c23bd3f773e0ceb4cae518987c73edc90f6d /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
parent: Remove a superfluous array creation (diff)
parent: compiler warnings revealed that public PlaySoundSlavePrims properties were ch... (diff)
download: opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.zip
opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.gz
opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.bz2
opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.xz
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index e87f7ca..bd8ccce 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -103,15 +103,15 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        public event GetLandData OnGetLandData;
-        private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;
+//        private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;
-        private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser;
+//        private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser;
-        private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;
+//        private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;
-        private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
+//        private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
        //private RegionUp handlerRegionUp = null; // OnRegionUp;
-        private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
+//        private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
        //private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar;
-        private LogOffUser handlerLogOffUser = null;
+//        private LogOffUser handlerLogOffUser = null;
-        private GetLandData handlerGetLandData = null; // OnGetLandData
+//        private GetLandData handlerGetLandData = null; // OnGetLandData
        public KiPrimitiveDelegate KiPrimitive;
author	Melanie	2010-03-04 10:43:12 +0000
committer	Melanie	2010-03-04 10:43:12 +0000
commit	31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca (patch)
tree	e351c23bd3f773e0ceb4cae518987c73edc90f6d /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
parent	Remove a superfluous array creation (diff)
parent	compiler warnings revealed that public PlaySoundSlavePrims properties were ch... (diff)
download	opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.zip opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.gz opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.bz2 opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index e87f7ca..bd8ccce 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -103,15 +103,15 @@ namespace OpenSim.Region.Framework.Scenes
103	/// </summary>	103	/// </summary>
104	public event GetLandData OnGetLandData;	104	public event GetLandData OnGetLandData;
105		105
106	private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;	106	// private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;
107	private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser;	107	// private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser;
108	private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;	108	// private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;
109	private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;	109	// private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
110	//private RegionUp handlerRegionUp = null; // OnRegionUp;	110	//private RegionUp handlerRegionUp = null; // OnRegionUp;
111	private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;	111	// private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
112	//private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar;	112	//private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar;
113	private LogOffUser handlerLogOffUser = null;	113	// private LogOffUser handlerLogOffUser = null;
114	private GetLandData handlerGetLandData = null; // OnGetLandData	114	// private GetLandData handlerGetLandData = null; // OnGetLandData
115		115
116	public KiPrimitiveDelegate KiPrimitive;	116	public KiPrimitiveDelegate KiPrimitive;
117		117