From 629138d4fa16821d9572b58abe234b973ccf945e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 19 Sep 2012 13:01:34 +0200
Subject: Change texture price back to 10 C$
---
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/ClientStack/Linden')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
index ece40ac..44a2914 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
@@ -36,9 +36,8 @@ namespace OpenSim.Region.ClientStack.Linden
// this parameters scale them to basic cost ( so 1.0 translates to 10 )
public float ModelMeshCostFactor = 1.0f; // scale total cost relative to basic (excluding textures)
- public float ModelTextureCostFactor = 0.25f; //(2.5c$) scale textures fee to basic.
- // promote integration in a model
- // since they will not show up in inventory
+ public float ModelTextureCostFactor = 1.00f; // keep full price because texture price
+ // is based on it's storage needs not on usability
public float ModelMinCostFactor = 0.5f; // minimum total model free excluding textures
// itens costs in normalized values
--
cgit v1.1
From 9ff6c85325bfe8a046abaf72267e215f05ec893e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 20 Sep 2012 15:39:46 +0200
Subject: Make uploads free for now - we will have to announce this
---
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region/ClientStack/Linden')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
index 44a2914..8099069 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
// fees are normalized to 1.0
// this parameters scale them to basic cost ( so 1.0 translates to 10 )
- public float ModelMeshCostFactor = 1.0f; // scale total cost relative to basic (excluding textures)
- public float ModelTextureCostFactor = 1.00f; // keep full price because texture price
+ public float ModelMeshCostFactor = 0f; //Free
+ public float ModelMinCostFactor = 0f; // Free
+ //public float ModelMeshCostFactor = 1.0f; // scale total cost relative to basic (excluding textures)
+ //public float ModelMinCostFactor = 0.5f; // minimum total model free excluding textures
+
+ //public float ModelTextureCostFactor = 1.00f; // keep full price because texture price
// is based on it's storage needs not on usability
- public float ModelMinCostFactor = 0.5f; // minimum total model free excluding textures
// itens costs in normalized values
// ie will be multiplied by basicCost and factors above
--
cgit v1.1
From 5d63c20122351296298d9ec841a569e1c008ba4b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 20 Sep 2012 15:41:16 +0200
Subject: refix prior commit
---
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/ClientStack/Linden')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
index 8099069..da701ba 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.ClientStack.Linden
//public float ModelMeshCostFactor = 1.0f; // scale total cost relative to basic (excluding textures)
//public float ModelMinCostFactor = 0.5f; // minimum total model free excluding textures
- //public float ModelTextureCostFactor = 1.00f; // keep full price because texture price
+ public float ModelTextureCostFactor = 1.00f; // keep full price because texture price
// is based on it's storage needs not on usability
// itens costs in normalized values
--
cgit v1.1
From 68ece236a6cd8a2a9bc009287e43debdc6e9a79d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 23 Sep 2012 23:55:28 +0200
Subject: Protect the responses map with a lock. Also remove ugly "this." type
of member notation.
---
.../ClientStack/Linden/Caps/GetTextureModule.cs | 14 ++++++-----
.../Linden/Caps/WebFetchInvDescModule.cs | 28 ++++++++++++----------
2 files changed, 24 insertions(+), 18 deletions(-)
(limited to 'OpenSim/Region/ClientStack/Linden')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 0ac56ec..2000279 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -146,14 +146,14 @@ namespace OpenSim.Region.ClientStack.Linden
{
m_scene = scene;
- HasEvents = (x, y) => { return this.responses.ContainsKey(x); };
+ HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); };
GetEvents = (x, y, s) =>
{
lock (responses)
{
try
{
- return this.responses[x];
+ return responses[x];
}
finally
{
@@ -165,15 +165,15 @@ namespace OpenSim.Region.ClientStack.Linden
Request = (x, y) =>
{
y["RequestID"] = x.ToString();
- lock (this.requests)
- this.requests.Add(y);
+ lock (requests)
+ requests.Add(y);
m_queue.Enqueue(this);
};
NoEvents = (x, y) =>
{
- lock (this.requests)
+ lock (requests)
{
Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString());
requests.Remove(request);
@@ -198,7 +198,7 @@ namespace OpenSim.Region.ClientStack.Linden
try
{
- lock (this.requests)
+ lock (requests)
{
request = requests[0];
requests.RemoveAt(0);
@@ -221,8 +221,10 @@ namespace OpenSim.Region.ClientStack.Linden
response["content_type"] = "text/plain";
response["keepalive"] = false;
response["reusecontext"] = false;
+
lock (responses)
responses[requestID] = response;
+
return;
}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 4908c2c..f76ea74 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -144,31 +144,34 @@ namespace OpenSim.Region.ClientStack.Linden
public PollServiceInventoryEventArgs(UUID pId) :
base(null, null, null, null, pId, 30000)
{
- HasEvents = (x, y) => { return this.responses.ContainsKey(x); };
+ HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); };
GetEvents = (x, y, s) =>
{
- try
+ lock (responses)
{
- return this.responses[x];
- }
- finally
- {
- responses.Remove(x);
+ try
+ {
+ return responses[x];
+ }
+ finally
+ {
+ responses.Remove(x);
+ }
}
};
Request = (x, y) =>
{
y["RequestID"] = x.ToString();
- lock (this.requests)
- this.requests.Add(y);
+ lock (requests)
+ requests.Add(y);
m_queue.Enqueue(this);
};
NoEvents = (x, y) =>
{
- lock (this.requests)
+ lock (requests)
{
Hashtable request = requests.Find(id => id["RequestID"].ToString() == x.ToString());
requests.Remove(request);
@@ -192,7 +195,7 @@ namespace OpenSim.Region.ClientStack.Linden
try
{
- lock (this.requests)
+ lock (requests)
{
request = requests[0];
requests.RemoveAt(0);
@@ -214,7 +217,8 @@ namespace OpenSim.Region.ClientStack.Linden
response["str_response_string"] = m_webFetchHandler.FetchInventoryDescendentsRequest(request["body"].ToString(), String.Empty, String.Empty, null, null);
- responses[requestID] = response;
+ lock (responses)
+ responses[requestID] = response;
}
}
--
cgit v1.1
From ca67ee60ac0e0c26d6d32fc68d48ef63570f034d Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 24 Sep 2012 21:22:08 +0100
Subject: add missing transactionID in SendInventoryItemCreateUpdate. and make
use of it on inventoryAccessModule, etc. Most likelly it's needs where there
is a transactionID not zero
---
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/ClientStack/Linden')
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 7749ef3..ee28914 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2067,9 +2067,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
}
- /// IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)
public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId)
{
+ SendInventoryItemCreateUpdate(Item, UUID.Zero, callbackId);
+ }
+
+ /// IClientAPI.SendInventoryItemCreateUpdate(InventoryItemBase)
+ public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
+ {
const uint FULL_MASK_PERMISSIONS = (uint)PermissionMask.All;
UpdateCreateInventoryItemPacket InventoryReply
@@ -2079,6 +2084,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// TODO: don't create new blocks if recycling an old packet
InventoryReply.AgentData.AgentID = AgentId;
InventoryReply.AgentData.SimApproved = true;
+ InventoryReply.AgentData.TransactionID = transactionID;
InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
InventoryReply.InventoryData[0].ItemID = Item.ID;
--
cgit v1.1