Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-09-17 18:49:56 +02:00
commit 4336806ddf
1 changed files with 1 additions and 15 deletions

View File

@ -42,10 +42,6 @@ namespace OpenSim.Region.ClientStack.Linden
const float physMeshSizeWth = 6f; // counts 7x const float physMeshSizeWth = 6f; // counts 7x
const float physHullSizeWth = 8f; // counts 9x const float physHullSizeWth = 8f; // counts 9x
// price compression to promote complex meshs
const float feeCompressionBase = 50.0f; // transition from linear to log cost
const float feeCompressionScale = 250.0f; // 10000 scales to 1000
// stream cost size factors // stream cost size factors
const float highLodFactor = 17.36f; const float highLodFactor = 17.36f;
const float midLodFactor = 277.78f; const float midLodFactor = 277.78f;
@ -373,17 +369,7 @@ namespace OpenSim.Region.ClientStack.Linden
// bytes to money // bytes to money
sfee *= bytecost; sfee *= bytecost;
// fee compression
if (sfee > feeCompressionBase)
{
sfee -= feeCompressionBase;
sfee = feeCompressionScale * (float)Math.Log10((double)sfee);
sfee += feeCompressionBase;
}
cost.costFee = sfee; cost.costFee = sfee;
return true; return true;
} }