diff options
author | Jeff Ames | 2008-10-05 14:15:39 +0000 |
---|---|---|
committer | Jeff Ames | 2008-10-05 14:15:39 +0000 |
commit | aab6cdd8b05a97c8906a67eb8d3233580fbebb2f (patch) | |
tree | 1020456338cb7cc0b5ce5769fc4c0d85bd47bfe8 /OpenSim/Region/Environment/Scenes | |
parent | * An update to the UDP Packet handler which might make the giant sized crater... (diff) | |
download | opensim-SC-aab6cdd8b05a97c8906a67eb8d3233580fbebb2f.zip opensim-SC-aab6cdd8b05a97c8906a67eb8d3233580fbebb2f.tar.gz opensim-SC-aab6cdd8b05a97c8906a67eb8d3233580fbebb2f.tar.bz2 opensim-SC-aab6cdd8b05a97c8906a67eb8d3233580fbebb2f.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
4 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 6b3e796..fdde801 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -857,7 +857,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
857 | else | 857 | else |
858 | return null; | 858 | return null; |
859 | } | 859 | } |
860 | 860 | ||
861 | /// <summary> | 861 | /// <summary> |
862 | /// Get a named prim contained in this scene (will return the first | 862 | /// Get a named prim contained in this scene (will return the first |
863 | /// found, if there are more than one prim with the same name) | 863 | /// found, if there are more than one prim with the same name) |
@@ -872,13 +872,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
872 | { | 872 | { |
873 | if (ent is SceneObjectGroup) | 873 | if (ent is SceneObjectGroup) |
874 | { | 874 | { |
875 | foreach(SceneObjectPart p in ((SceneObjectGroup) ent).GetParts()) | 875 | foreach (SceneObjectPart p in ((SceneObjectGroup) ent).GetParts()) |
876 | { | 876 | { |
877 | if (p.Name==name) | 877 | if (p.Name==name) |
878 | { | 878 | { |
879 | return p; | 879 | return p; |
880 | } | 880 | } |
881 | } | 881 | } |
882 | } | 882 | } |
883 | } | 883 | } |
884 | return null; | 884 | return null; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 2285b04..729572a 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -2292,7 +2292,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2292 | public void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient) | 2292 | public void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient) |
2293 | { | 2293 | { |
2294 | SceneObjectPart part = GetSceneObjectPart(itemID); | 2294 | SceneObjectPart part = GetSceneObjectPart(itemID); |
2295 | if(part == null || part.ParentGroup == null) | 2295 | if (part == null || part.ParentGroup == null) |
2296 | return; | 2296 | return; |
2297 | 2297 | ||
2298 | UUID inventoryID = part.ParentGroup.GetFromAssetID(); | 2298 | UUID inventoryID = part.ParentGroup.GetFromAssetID(); |
@@ -2300,7 +2300,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2300 | ScenePresence presence; | 2300 | ScenePresence presence; |
2301 | if (TryGetAvatar(remoteClient.AgentId, out presence)) | 2301 | if (TryGetAvatar(remoteClient.AgentId, out presence)) |
2302 | { | 2302 | { |
2303 | if(!ExternalChecks.ExternalChecksCanRezObject(part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition)) | 2303 | if (!ExternalChecks.ExternalChecksCanRezObject(part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition)) |
2304 | return; | 2304 | return; |
2305 | 2305 | ||
2306 | presence.Appearance.DetachAttachment(itemID); | 2306 | presence.Appearance.DetachAttachment(itemID); |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 7b9183a..342742d 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -3896,7 +3896,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3896 | // } | 3896 | // } |
3897 | // } | 3897 | // } |
3898 | 3898 | ||
3899 | /// <summary> | 3899 | /// <summary> |
3900 | /// Get a named prim contained in this scene (will return the first | 3900 | /// Get a named prim contained in this scene (will return the first |
3901 | /// found, if there are more than one prim with the same name) | 3901 | /// found, if there are more than one prim with the same name) |
3902 | /// </summary> | 3902 | /// </summary> |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 9e605c1..08623aa 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -2759,7 +2759,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2759 | 2759 | ||
2760 | public void SetAttachmentPoint(byte point) | 2760 | public void SetAttachmentPoint(byte point) |
2761 | { | 2761 | { |
2762 | lock(m_parts) | 2762 | lock (m_parts) |
2763 | { | 2763 | { |
2764 | foreach (SceneObjectPart part in m_parts.Values) | 2764 | foreach (SceneObjectPart part in m_parts.Values) |
2765 | part.SetAttachmentPoint(point); | 2765 | part.SetAttachmentPoint(point); |