diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 3753dcb..024bdc9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1010,12 +1010,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1010 | return m_mediaUrl; | 1010 | return m_mediaUrl; |
1011 | } | 1011 | } |
1012 | 1012 | ||
1013 | set | 1013 | set |
1014 | { | 1014 | { |
1015 | m_mediaUrl = value; | 1015 | m_mediaUrl = value; |
1016 | 1016 | ||
1017 | if (ParentGroup != null) | 1017 | if (ParentGroup != null) |
1018 | ParentGroup.HasGroupChanged = true; | 1018 | ParentGroup.HasGroupChanged = true; |
1019 | } | 1019 | } |
1020 | } | 1020 | } |
1021 | 1021 | ||
@@ -1028,7 +1028,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1028 | // m_log.DebugFormat("[SOP]: Setting CreateSelected to {0} for {1} {2}", value, Name, UUID); | 1028 | // m_log.DebugFormat("[SOP]: Setting CreateSelected to {0} for {1} {2}", value, Name, UUID); |
1029 | m_createSelected = value; | 1029 | m_createSelected = value; |
1030 | } | 1030 | } |
1031 | } | 1031 | } |
1032 | 1032 | ||
1033 | #endregion | 1033 | #endregion |
1034 | 1034 | ||
@@ -1189,7 +1189,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1189 | 1189 | ||
1190 | /// <summary> | 1190 | /// <summary> |
1191 | /// Property flags. See OpenMetaverse.PrimFlags | 1191 | /// Property flags. See OpenMetaverse.PrimFlags |
1192 | /// </summary> | 1192 | /// </summary> |
1193 | /// Example properties are PrimFlags.Phantom and PrimFlags.DieAtEdge | 1193 | /// Example properties are PrimFlags.Phantom and PrimFlags.DieAtEdge |
1194 | public PrimFlags Flags | 1194 | public PrimFlags Flags |
1195 | { | 1195 | { |
@@ -1355,7 +1355,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1355 | 1355 | ||
1356 | /// <summary> | 1356 | /// <summary> |
1357 | /// Tell the scene presence that it should send updates for this part to its client | 1357 | /// Tell the scene presence that it should send updates for this part to its client |
1358 | /// </summary> | 1358 | /// </summary> |
1359 | public void AddFullUpdateToAvatar(ScenePresence presence) | 1359 | public void AddFullUpdateToAvatar(ScenePresence presence) |
1360 | { | 1360 | { |
1361 | presence.SceneViewer.QueuePartForUpdate(this); | 1361 | presence.SceneViewer.QueuePartForUpdate(this); |
@@ -1414,7 +1414,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1414 | 1414 | ||
1415 | m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp) | 1415 | m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp) |
1416 | { | 1416 | { |
1417 | if(!sp.IsChildAgent) | 1417 | if (!sp.IsChildAgent) |
1418 | sp.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume); | 1418 | sp.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume); |
1419 | }); | 1419 | }); |
1420 | } | 1420 | } |
@@ -1659,7 +1659,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1659 | 1659 | ||
1660 | // m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID); | 1660 | // m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID); |
1661 | 1661 | ||
1662 | return dupe; | 1662 | return dupe; |
1663 | } | 1663 | } |
1664 | 1664 | ||
1665 | protected void AssetReceived(string id, Object sender, AssetBase asset) | 1665 | protected void AssetReceived(string id, Object sender, AssetBase asset) |
@@ -1969,10 +1969,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1969 | } | 1969 | } |
1970 | 1970 | ||
1971 | public uint GetEffectiveObjectFlags() | 1971 | public uint GetEffectiveObjectFlags() |
1972 | { | 1972 | { |
1973 | // Commenting this section of code out since it doesn't actually do anything, as enums are handled by | 1973 | // Commenting this section of code out since it doesn't actually do anything, as enums are handled by |
1974 | // value rather than reference | 1974 | // value rather than reference |
1975 | // PrimFlags f = _flags; | 1975 | // PrimFlags f = _flags; |
1976 | // if (m_parentGroup == null || m_parentGroup.RootPart == this) | 1976 | // if (m_parentGroup == null || m_parentGroup.RootPart == this) |
1977 | // f &= ~(PrimFlags.Touch | PrimFlags.Money); | 1977 | // f &= ~(PrimFlags.Touch | PrimFlags.Money); |
1978 | 1978 | ||
@@ -4733,7 +4733,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4733 | if (ParentGroup == null || ParentGroup.IsDeleted) | 4733 | if (ParentGroup == null || ParentGroup.IsDeleted) |
4734 | return; | 4734 | return; |
4735 | 4735 | ||
4736 | if (IsAttachment && ParentGroup.RootPart != this) | 4736 | if (IsAttachment && ParentGroup.RootPart != this) |
4737 | return; | 4737 | return; |
4738 | 4738 | ||
4739 | // Causes this thread to dig into the Client Thread Data. | 4739 | // Causes this thread to dig into the Client Thread Data. |