diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 5c38bf3..4f3f83a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1179,9 +1179,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1179 | 1179 | ||
1180 | set | 1180 | set |
1181 | { | 1181 | { |
1182 | string old = m_mediaUrl; | ||
1182 | m_mediaUrl = value; | 1183 | m_mediaUrl = value; |
1183 | 1184 | ||
1184 | if (ParentGroup != null) | 1185 | if (ParentGroup != null && old != m_mediaUrl) |
1185 | ParentGroup.HasGroupChanged = true; | 1186 | ParentGroup.HasGroupChanged = true; |
1186 | } | 1187 | } |
1187 | } | 1188 | } |
@@ -1385,13 +1386,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1385 | } | 1386 | } |
1386 | } | 1387 | } |
1387 | 1388 | ||
1388 | [XmlIgnore] | ||
1389 | public bool IsOccupied // KF If an av is sittingon this prim | ||
1390 | { | ||
1391 | get { return m_occupied; } | ||
1392 | set { m_occupied = value; } | ||
1393 | } | ||
1394 | |||
1395 | /// <summary> | 1389 | /// <summary> |
1396 | /// ID of the avatar that is sat on us if we have a sit target. If there is no such avatar then is UUID.Zero | 1390 | /// ID of the avatar that is sat on us if we have a sit target. If there is no such avatar then is UUID.Zero |
1397 | /// </summary> | 1391 | /// </summary> |
@@ -2472,12 +2466,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2472 | 2466 | ||
2473 | public uint GetEffectiveObjectFlags() | 2467 | public uint GetEffectiveObjectFlags() |
2474 | { | 2468 | { |
2475 | // Commenting this section of code out since it doesn't actually do anything, as enums are handled by | ||
2476 | // value rather than reference | ||
2477 | // PrimFlags f = _flags; | ||
2478 | // if (m_parentGroup == null || m_parentGroup.RootPart == this) | ||
2479 | // f &= ~(PrimFlags.Touch | PrimFlags.Money); | ||
2480 | |||
2481 | uint eff = (uint)Flags | (uint)LocalFlags; | 2469 | uint eff = (uint)Flags | (uint)LocalFlags; |
2482 | if(m_inventory == null || m_inventory.Count == 0) | 2470 | if(m_inventory == null || m_inventory.Count == 0) |
2483 | eff |= (uint)PrimFlags.InventoryEmpty; | 2471 | eff |= (uint)PrimFlags.InventoryEmpty; |