diff options
| author | Justin Clark-Casey (justincc) | 2011-05-26 01:28:48 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-05-26 01:28:48 +0100 |
| commit | d9889ae2e73569f3e0d9f13523a9e019ec00749a (patch) | |
| tree | 75c43c6b89add43fdeec8f7436ac6fe95103f38a /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Add a --noassets option to "save oar". (diff) | |
| parent | Add PayPrice to serialization format Xml2 (diff) | |
| download | opensim-SC_OLD-d9889ae2e73569f3e0d9f13523a9e019ec00749a.zip opensim-SC_OLD-d9889ae2e73569f3e0d9f13523a9e019ec00749a.tar.gz opensim-SC_OLD-d9889ae2e73569f3e0d9f13523a9e019ec00749a.tar.bz2 opensim-SC_OLD-d9889ae2e73569f3e0d9f13523a9e019ec00749a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 8a8a699..331abb2 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -144,11 +144,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 144 | 144 | ||
| 145 | public Vector3 StatusSandboxPos; | 145 | public Vector3 StatusSandboxPos; |
| 146 | 146 | ||
| 147 | // TODO: This needs to be persisted in next XML version update! | 147 | [XmlIgnore] |
| 148 | 148 | public int[] PayPrice = {-2,-2,-2,-2,-2}; | |
| 149 | public readonly int[] PayPrice = {-2,-2,-2,-2,-2}; | 149 | |
| 150 | 150 | [XmlIgnore] | |
| 151 | |||
| 152 | public PhysicsActor PhysActor | 151 | public PhysicsActor PhysActor |
| 153 | { | 152 | { |
| 154 | get { return m_physActor; } | 153 | get { return m_physActor; } |