aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-12-15 08:15:12 +0100
committerMelanie2010-12-15 08:15:12 +0100
commitf8beeb1e93daf2aba2892339ba284dad9ccff906 (patch)
tree03d3d5d0887514a64cef56e9b34af94eb909e8be /OpenSim
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-f8beeb1e93daf2aba2892339ba284dad9ccff906.zip
opensim-SC-f8beeb1e93daf2aba2892339ba284dad9ccff906.tar.gz
opensim-SC-f8beeb1e93daf2aba2892339ba284dad9ccff906.tar.bz2
opensim-SC-f8beeb1e93daf2aba2892339ba284dad9ccff906.tar.xz
Fix casts in llSetPayPrice
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs11
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs10
2 files changed, 15 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 6ed4867..e542d7d 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -271,7 +271,16 @@ namespace Flotsam.RegionModules.AssetCache
271 // If the file is already cached, don't cache it, just touch it so access time is updated 271 // If the file is already cached, don't cache it, just touch it so access time is updated
272 if (File.Exists(filename)) 272 if (File.Exists(filename))
273 { 273 {
274 File.SetLastAccessTime(filename, DateTime.Now); 274 // We don't really want to know about sharing
275 // violations here. If the file is locked, then
276 // the other thread has updated the time for us.
277 try
278 {
279 File.SetLastAccessTime(filename, DateTime.Now);
280 }
281 catch
282 {
283 }
275 } else { 284 } else {
276 285
277 // Once we start writing, make sure we flag that we're writing 286 // Once we start writing, make sure we flag that we're writing
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 835f274..f06fd24 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9816,11 +9816,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9816 } 9816 }
9817 } 9817 }
9818 int[] nPrice = new int[5]; 9818 int[] nPrice = new int[5];
9819 nPrice[0]=price; 9819 nPrice[0] = price;
9820 nPrice[1] = (LSL_Integer)Convert.ToInt32(quick_pay_buttons.Data[0]); 9820 nPrice[1] = quick_pay_buttons.GetLSLIntegerItem(0);
9821 nPrice[2] = (LSL_Integer)Convert.ToInt32(quick_pay_buttons.Data[1]); 9821 nPrice[2] = quick_pay_buttons.GetLSLIntegerItem(1);
9822 nPrice[3] = (LSL_Integer)Convert.ToInt32(quick_pay_buttons.Data[2]); 9822 nPrice[3] = quick_pay_buttons.GetLSLIntegerItem(2);
9823 nPrice[4] = (LSL_Integer)Convert.ToInt32(quick_pay_buttons.Data[3]); 9823 nPrice[4] = quick_pay_buttons.GetLSLIntegerItem(3);
9824 m_host.ParentGroup.RootPart.PayPrice = nPrice; 9824 m_host.ParentGroup.RootPart.PayPrice = nPrice;
9825 m_host.ParentGroup.HasGroupChanged = true; 9825 m_host.ParentGroup.HasGroupChanged = true;
9826 } 9826 }