OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix casts in llSetPayPrice

avinationmerge
Melanie 2010-12-15 08:15:12 +01:00
parent cb51fc129e
commit f8beeb1e93
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
View File

@ -271,7 +271,16 @@ namespace Flotsam.RegionModules.AssetCache
// If the file is already cached, don't cache it, just touch it so access time is updated // If the file is already cached, don't cache it, just touch it so access time is updated
if (File.Exists(filename)) if (File.Exists(filename))
{ {
File.SetLastAccessTime(filename, DateTime.Now); // We don't really want to know about sharing
// violations here. If the file is locked, then
// the other thread has updated the time for us.
try
{
File.SetLastAccessTime(filename, DateTime.Now);
}
catch
{
}
} else { } else {
// Once we start writing, make sure we flag that we're writing // Once we start writing, make sure we flag that we're writing

10
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -9816,11 +9816,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
int[] nPrice = new int[5]; int[] nPrice = new int[5];
nPrice[0]=price; nPrice[0] = price;
nPrice[1] = (LSL_Integer)Convert.ToInt32(quick_pay_buttons.Data[0]); nPrice[1] = quick_pay_buttons.GetLSLIntegerItem(0);
nPrice[2] = (LSL_Integer)Convert.ToInt32(quick_pay_buttons.Data[1]); nPrice[2] = quick_pay_buttons.GetLSLIntegerItem(1);
nPrice[3] = (LSL_Integer)Convert.ToInt32(quick_pay_buttons.Data[2]); nPrice[3] = quick_pay_buttons.GetLSLIntegerItem(2);
nPrice[4] = (LSL_Integer)Convert.ToInt32(quick_pay_buttons.Data[3]); nPrice[4] = quick_pay_buttons.GetLSLIntegerItem(3);
m_host.ParentGroup.RootPart.PayPrice = nPrice; m_host.ParentGroup.RootPart.PayPrice = nPrice;
m_host.ParentGroup.HasGroupChanged = true; m_host.ParentGroup.HasGroupChanged = true;
} }