diff options
| author | CasperW | 2010-01-20 22:14:43 +0100 |
|---|---|---|
| committer | CasperW | 2010-01-20 22:14:43 +0100 |
| commit | 496a8a4f7ca5422daa30913595b6b1a03fa8a59a (patch) | |
| tree | 0ca3bb64f6105e1876aa9ec9957cf16f42db2892 | |
| parent | Fix a major security problem with osSetDynamicTexture which allowed the delet... (diff) | |
| download | opensim-SC_OLD-496a8a4f7ca5422daa30913595b6b1a03fa8a59a.zip opensim-SC_OLD-496a8a4f7ca5422daa30913595b6b1a03fa8a59a.tar.gz opensim-SC_OLD-496a8a4f7ca5422daa30913595b6b1a03fa8a59a.tar.bz2 opensim-SC_OLD-496a8a4f7ca5422daa30913595b6b1a03fa8a59a.tar.xz | |
Fixed an issue with PayPrice sometimes being shared between multiple objects
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index a7c14cf..4c97467 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -109,7 +109,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 109 | 109 | ||
| 110 | // TODO: This needs to be persisted in next XML version update! | 110 | // TODO: This needs to be persisted in next XML version update! |
| 111 | [XmlIgnore] | 111 | [XmlIgnore] |
| 112 | public readonly int[] PayPrice = {-2,-2,-2,-2,-2}; | 112 | public int[] PayPrice = {-2,-2,-2,-2,-2}; |
| 113 | [XmlIgnore] | 113 | [XmlIgnore] |
| 114 | public PhysicsActor PhysActor; | 114 | public PhysicsActor PhysActor; |
| 115 | 115 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 085d61f..a5aecd8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -8946,12 +8946,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 8946 | LSLError("List must have at least 4 elements"); | 8946 | LSLError("List must have at least 4 elements"); |
| 8947 | return; | 8947 | return; |
| 8948 | } | 8948 | } |
| 8949 | m_host.ParentGroup.RootPart.PayPrice[0]=price; | 8949 | int[] nPrice = new int[5]; |
| 8950 | 8950 | nPrice[0]=price; | |
| 8951 | m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0]; | 8951 | nPrice[1] = (LSL_Integer)quick_pay_buttons.Data[0]; |
| 8952 | m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1]; | 8952 | nPrice[2] = (LSL_Integer)quick_pay_buttons.Data[1]; |
| 8953 | m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2]; | 8953 | nPrice[3] = (LSL_Integer)quick_pay_buttons.Data[2]; |
| 8954 | m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3]; | 8954 | nPrice[4] = (LSL_Integer)quick_pay_buttons.Data[3]; |
| 8955 | m_host.ParentGroup.RootPart.PayPrice = nPrice; | ||
| 8955 | m_host.ParentGroup.HasGroupChanged = true; | 8956 | m_host.ParentGroup.HasGroupChanged = true; |
| 8956 | } | 8957 | } |
| 8957 | 8958 | ||