diff options
author | lbsa71 | 2007-12-27 21:41:48 +0000 |
---|---|---|
committer | lbsa71 | 2007-12-27 21:41:48 +0000 |
commit | efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 (patch) | |
tree | bf5b897e1e3c13211e3e2fc61d30508b94c928c0 /OpenSim/Region/Environment/Scenes/SceneEvents.cs | |
parent | * removed always true if (diff) | |
download | opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.zip opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.gz opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.bz2 opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.xz |
* Optimized usings
* shortened references
* Removed redundant 'this'
* Normalized EOF
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneEvents.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneEvents.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs index 9c8c62b..a6a8fb6 100644 --- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs +++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
105 | public delegate void LandObjectAdded(Land newParcel, LLUUID regionUUID); | 105 | public delegate void LandObjectAdded(Land newParcel, LLUUID regionUUID); |
106 | 106 | ||
107 | public event LandObjectAdded OnLandObjectAdded; | 107 | public event LandObjectAdded OnLandObjectAdded; |
108 | 108 | ||
109 | public delegate void LandObjectRemoved(LLUUID globalID); | 109 | public delegate void LandObjectRemoved(LLUUID globalID); |
110 | 110 | ||
111 | public event LandObjectRemoved OnLandObjectRemoved; | 111 | public event LandObjectRemoved OnLandObjectRemoved; |
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
117 | 117 | ||
118 | public void TriggerOnClientMovement(ScenePresence avatar) | 118 | public void TriggerOnClientMovement(ScenePresence avatar) |
119 | { | 119 | { |
120 | if(OnClientMovement != null) | 120 | if (OnClientMovement != null) |
121 | OnClientMovement(avatar); | 121 | OnClientMovement(avatar); |
122 | } | 122 | } |
123 | 123 | ||
@@ -223,7 +223,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
223 | { | 223 | { |
224 | if (OnSceneGroupMove != null) | 224 | if (OnSceneGroupMove != null) |
225 | { | 225 | { |
226 | return OnSceneGroupMove(groupID, delta); | 226 | return OnSceneGroupMove(groupID, delta); |
227 | } | 227 | } |
228 | return true; | 228 | return true; |
229 | } | 229 | } |
@@ -236,13 +236,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
236 | } | 236 | } |
237 | } | 237 | } |
238 | 238 | ||
239 | public void TriggerLandObjectAdded(Land newParcel,LLUUID regionID) | 239 | public void TriggerLandObjectAdded(Land newParcel, LLUUID regionID) |
240 | { | 240 | { |
241 | if (OnLandObjectAdded != null) | 241 | if (OnLandObjectAdded != null) |
242 | { | 242 | { |
243 | OnLandObjectAdded(newParcel, regionID); | 243 | OnLandObjectAdded(newParcel, regionID); |
244 | } | 244 | } |
245 | } | 245 | } |
246 | |||
246 | public void TriggerLandObjectRemoved(LLUUID globalID) | 247 | public void TriggerLandObjectRemoved(LLUUID globalID) |
247 | { | 248 | { |
248 | if (OnLandObjectRemoved != null) | 249 | if (OnLandObjectRemoved != null) |
@@ -250,10 +251,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
250 | OnLandObjectRemoved(globalID); | 251 | OnLandObjectRemoved(globalID); |
251 | } | 252 | } |
252 | } | 253 | } |
254 | |||
253 | public void TriggerLandObjectUpdated(uint localParcelID, Land newParcel) | 255 | public void TriggerLandObjectUpdated(uint localParcelID, Land newParcel) |
254 | { | 256 | { |
255 | //triggerLandObjectRemoved(localParcelID); | 257 | //triggerLandObjectRemoved(localParcelID); |
256 | TriggerLandObjectAdded(newParcel,newParcel.m_scene.RegionInfo.RegionID); | 258 | TriggerLandObjectAdded(newParcel, newParcel.m_scene.RegionInfo.RegionID); |
257 | } | 259 | } |
258 | 260 | ||
259 | public void TriggerAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, LLUUID regionID) | 261 | public void TriggerAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, LLUUID regionID) |