aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJeff Ames2010-03-10 13:15:36 +0900
committerJeff Ames2010-03-10 13:15:36 +0900
commitf58a0394edf3c0e4d46faf1f3053b940ba0a1c8c (patch)
treef1d5a1e4dfa36cfad3c4512fb1c9ba4dc19b2683 /OpenSim/Region/Framework/Scenes/Scene.cs
parentChanged a cryptic debug message and a wrong comment (diff)
downloadopensim-SC-f58a0394edf3c0e4d46faf1f3053b940ba0a1c8c.zip
opensim-SC-f58a0394edf3c0e4d46faf1f3053b940ba0a1c8c.tar.gz
opensim-SC-f58a0394edf3c0e4d46faf1f3053b940ba0a1c8c.tar.bz2
opensim-SC-f58a0394edf3c0e4d46faf1f3053b940ba0a1c8c.tar.xz
Formatting cleanup. Add copyright notices.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 311821a..87a753e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1976,7 +1976,7 @@ namespace OpenSim.Region.Framework.Scenes
1976 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates) 1976 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
1977 { 1977 {
1978 return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates); 1978 return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates);
1979 } 1979 }
1980 1980
1981 /// <summary> 1981 /// <summary>
1982 /// Delete every object from the scene 1982 /// Delete every object from the scene
@@ -2644,7 +2644,7 @@ namespace OpenSim.Region.Framework.Scenes
2644 public virtual void SubscribeToClientAttachmentEvents(IClientAPI client) 2644 public virtual void SubscribeToClientAttachmentEvents(IClientAPI client)
2645 { 2645 {
2646 client.OnRezSingleAttachmentFromInv += RezSingleAttachment; 2646 client.OnRezSingleAttachmentFromInv += RezSingleAttachment;
2647 client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachments; 2647 client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachments;
2648 client.OnObjectAttach += m_sceneGraph.AttachObject; 2648 client.OnObjectAttach += m_sceneGraph.AttachObject;
2649 client.OnObjectDetach += m_sceneGraph.DetachObject; 2649 client.OnObjectDetach += m_sceneGraph.DetachObject;
2650 2650
@@ -2696,7 +2696,7 @@ namespace OpenSim.Region.Framework.Scenes
2696 } 2696 }
2697 2697
2698 protected virtual void UnsubscribeToClientEvents(IClientAPI client) 2698 protected virtual void UnsubscribeToClientEvents(IClientAPI client)
2699 { 2699 {
2700 } 2700 }
2701 2701
2702 /// <summary> 2702 /// <summary>
@@ -2797,13 +2797,13 @@ namespace OpenSim.Region.Framework.Scenes
2797 } 2797 }
2798 2798
2799 public virtual void UnSubscribeToClientAttachmentEvents(IClientAPI client) 2799 public virtual void UnSubscribeToClientAttachmentEvents(IClientAPI client)
2800 { 2800 {
2801 client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachments; 2801 client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachments;
2802 client.OnRezSingleAttachmentFromInv -= RezSingleAttachment; 2802 client.OnRezSingleAttachmentFromInv -= RezSingleAttachment;
2803 client.OnObjectAttach -= m_sceneGraph.AttachObject; 2803 client.OnObjectAttach -= m_sceneGraph.AttachObject;
2804 client.OnObjectDetach -= m_sceneGraph.DetachObject; 2804 client.OnObjectDetach -= m_sceneGraph.DetachObject;
2805 2805
2806 if (AttachmentsModule != null) 2806 if (AttachmentsModule != null)
2807 client.OnDetachAttachmentIntoInv -= AttachmentsModule.ShowDetachInUserInventory; 2807 client.OnDetachAttachmentIntoInv -= AttachmentsModule.ShowDetachInUserInventory;
2808 } 2808 }
2809 2809
@@ -3526,7 +3526,7 @@ namespace OpenSim.Region.Framework.Scenes
3526 { 3526 {
3527 foreach (var parcel in AllParcels()) 3527 foreach (var parcel in AllParcels())
3528 { 3528 {
3529 if( parcel.ContainsPoint((int)x,(int)y)) 3529 if (parcel.ContainsPoint((int)x,(int)y))
3530 { 3530 {
3531 return parcel; 3531 return parcel;
3532 } 3532 }
@@ -4965,7 +4965,7 @@ namespace OpenSim.Region.Framework.Scenes
4965 private Vector3 GetPositionAtAvatarHeightOrGroundHeight(ScenePresence avatar, float x, float y) 4965 private Vector3 GetPositionAtAvatarHeightOrGroundHeight(ScenePresence avatar, float x, float y)
4966 { 4966 {
4967 Vector3 ground = GetPositionAtGround(x, y); 4967 Vector3 ground = GetPositionAtGround(x, y);
4968 if( avatar.AbsolutePosition.Z > ground.Z) 4968 if (avatar.AbsolutePosition.Z > ground.Z)
4969 { 4969 {
4970 ground.Z = avatar.AbsolutePosition.Z; 4970 ground.Z = avatar.AbsolutePosition.Z;
4971 } 4971 }