diff options
| author | Diva Canto | 2011-06-16 17:15:12 -0700 |
|---|---|---|
| committer | Diva Canto | 2011-06-16 17:15:12 -0700 |
| commit | 7819b4a794f5d20e9ff7e847f3063d5250d83aef (patch) | |
| tree | 1b76ea3d77c34cc518a477342ad93cdb5ff55fd4 /OpenSim/Region/Physics/Manager/PhysicsActor.cs | |
| parent | Added a couple of guards and warnings to the MapImage/MapImageServiceModule. (diff) | |
| parent | Add localID to physical object creation functions. (diff) | |
| download | opensim-SC_OLD-7819b4a794f5d20e9ff7e847f3063d5250d83aef.zip opensim-SC_OLD-7819b4a794f5d20e9ff7e847f3063d5250d83aef.tar.gz opensim-SC_OLD-7819b4a794f5d20e9ff7e847f3063d5250d83aef.tar.bz2 opensim-SC_OLD-7819b4a794f5d20e9ff7e847f3063d5250d83aef.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 880c3ea..1c36e55 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
| @@ -142,7 +142,12 @@ namespace OpenSim.Region.Physics.Manager | |||
| 142 | 142 | ||
| 143 | public abstract PrimitiveBaseShape Shape { set; } | 143 | public abstract PrimitiveBaseShape Shape { set; } |
| 144 | 144 | ||
| 145 | public abstract uint LocalID { set; } | 145 | uint m_baseLocalID; |
| 146 | public virtual uint LocalID | ||
| 147 | { | ||
| 148 | set { m_baseLocalID = value; } | ||
| 149 | get { return m_baseLocalID; } | ||
| 150 | } | ||
| 146 | 151 | ||
| 147 | public abstract bool Grabbed { set; } | 152 | public abstract bool Grabbed { set; } |
| 148 | 153 | ||