diff options
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs index f03d8d8..66bb429 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs | |||
@@ -35,10 +35,13 @@ namespace OpenSim.Region.ClientStack.Linden | |||
35 | // fees are normalized to 1.0 | 35 | // fees are normalized to 1.0 |
36 | // this parameters scale them to basic cost ( so 1.0 translates to 10 ) | 36 | // this parameters scale them to basic cost ( so 1.0 translates to 10 ) |
37 | 37 | ||
38 | public float ModelMeshCostFactor = 1.0f; // scale total cost relative to basic (excluding textures) | 38 | public float ModelMeshCostFactor = 0f; //Free |
39 | public float ModelTextureCostFactor = 1.0f; // scale textures fee to basic. | 39 | public float ModelMinCostFactor = 0f; // Free |
40 | public float ModelMinCostFactor = 0.5f; // minimum total model free excluding textures | 40 | //public float ModelMeshCostFactor = 1.0f; // scale total cost relative to basic (excluding textures) |
41 | //public float ModelMinCostFactor = 0.5f; // minimum total model free excluding textures | ||
41 | 42 | ||
43 | public float ModelTextureCostFactor = 1.00f; // keep full price because texture price | ||
44 | // is based on it's storage needs not on usability | ||
42 | // itens costs in normalized values | 45 | // itens costs in normalized values |
43 | // ie will be multiplied by basicCost and factors above | 46 | // ie will be multiplied by basicCost and factors above |
44 | const float primCreationCost = 0.002f; // extra cost for each prim creation overhead | 47 | const float primCreationCost = 0.002f; // extra cost for each prim creation overhead |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 56d289f..e6ad89c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2146,10 +2146,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2146 | { | 2146 | { |
2147 | if (asset != null) | 2147 | if (asset != null) |
2148 | SculptTextureCallback(asset); | 2148 | SculptTextureCallback(asset); |
2149 | else | 2149 | // else |
2150 | m_log.WarnFormat( | 2150 | // m_log.WarnFormat( |
2151 | "[SCENE OBJECT PART]: Part {0} {1} requested mesh/sculpt data for asset id {2} from asset service but received no data", | 2151 | // "[SCENE OBJECT PART]: Part {0} {1} requested mesh/sculpt data for asset id {2} from asset service but received no data", |
2152 | Name, UUID, id); | 2152 | // Name, UUID, id); |
2153 | } | 2153 | } |
2154 | 2154 | ||
2155 | /// <summary> | 2155 | /// <summary> |