aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2012-04-23 21:13:08 +0100
committerMelanie2012-04-23 21:13:08 +0100
commit159b3b27ca734ab523c47d2ab65397595b1c0a8e (patch)
tree8038d76c48e48b000e7f96eeade3d335db68daaa /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge branch 'master' into careminster (diff)
parentubitODE - do own timing control (as chODE does) until heartbeat does it right (diff)
downloadopensim-SC_OLD-159b3b27ca734ab523c47d2ab65397595b1c0a8e.zip
opensim-SC_OLD-159b3b27ca734ab523c47d2ab65397595b1c0a8e.tar.gz
opensim-SC_OLD-159b3b27ca734ab523c47d2ab65397595b1c0a8e.tar.bz2
opensim-SC_OLD-159b3b27ca734ab523c47d2ab65397595b1c0a8e.tar.xz
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs14
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0f7959d..37b5554 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -304,6 +304,9 @@ namespace OpenSim.Region.Framework.Scenes
304 protected float m_friction = 0.6f; // wood 304 protected float m_friction = 0.6f; // wood
305 protected float m_bounce = 0.5f; // wood 305 protected float m_bounce = 0.5f; // wood
306 306
307
308 protected bool m_isSelected = false;
309
307 /// <summary> 310 /// <summary>
308 /// Stores media texture data 311 /// Stores media texture data
309 /// </summary> 312 /// </summary>
@@ -577,6 +580,16 @@ namespace OpenSim.Region.Framework.Scenes
577 } 580 }
578 } 581 }
579 582
583 public bool IsSelected
584 {
585 get { return m_isSelected; }
586 set
587 {
588 m_isSelected = value;
589 if (ParentGroup != null)
590 ParentGroup.PartSelectChanged(value);
591 }
592 }
580 593
581 594
582 public Dictionary<int, string> CollisionFilter 595 public Dictionary<int, string> CollisionFilter
@@ -1907,6 +1920,7 @@ namespace OpenSim.Region.Framework.Scenes
1907 dupe.m_rezzed = m_rezzed; 1920 dupe.m_rezzed = m_rezzed;
1908 1921
1909 dupe.m_UndoRedo = null; 1922 dupe.m_UndoRedo = null;
1923 dupe.m_isSelected = false;
1910 1924
1911 dupe.IgnoreUndoUpdate = false; 1925 dupe.IgnoreUndoUpdate = false;
1912 dupe.Undoing = false; 1926 dupe.Undoing = false;