aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2012-01-28 00:18:12 +0000
committerMelanie2012-01-28 00:18:12 +0000
commit7352aea9ac82c0c1a580ffd00d4436a8ea98f2b6 (patch)
treee09e0fde68b645af20a37608bc45a0a6e9417cd0 /OpenSim/Region/ClientStack
parentAdd OS_NPC_SENSE_AS_AGENT option to osNpcCreate(). (diff)
downloadopensim-SC_OLD-7352aea9ac82c0c1a580ffd00d4436a8ea98f2b6.zip
opensim-SC_OLD-7352aea9ac82c0c1a580ffd00d4436a8ea98f2b6.tar.gz
opensim-SC_OLD-7352aea9ac82c0c1a580ffd00d4436a8ea98f2b6.tar.bz2
opensim-SC_OLD-7352aea9ac82c0c1a580ffd00d4436a8ea98f2b6.tar.xz
Remove IClientAPI from the money module. It was only used to pass in the
agent id anyway
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 2347cf2..7bc59fc 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -366,7 +366,7 @@ namespace OpenSim.Region.ClientStack.Linden
366 366
367 if (mm != null) 367 if (mm != null)
368 { 368 {
369 if (!mm.UploadCovered(client, mm.UploadCharge)) 369 if (!mm.UploadCovered(client.AgentId, mm.UploadCharge))
370 { 370 {
371 if (client != null) 371 if (client != null)
372 client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); 372 client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
@@ -1018,4 +1018,4 @@ namespace OpenSim.Region.ClientStack.Linden
1018 fs.Close(); 1018 fs.Close();
1019 } 1019 }
1020 } 1020 }
1021} \ No newline at end of file 1021}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
index b2f04f9..aed03b3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Region.ClientStack.Linden
147 { 147 {
148 if (m_scene.TryGetClient(agentID, out client)) 148 if (m_scene.TryGetClient(agentID, out client))
149 { 149 {
150 if (!mm.UploadCovered(client, mm.UploadCharge)) 150 if (!mm.UploadCovered(client.AgentId, mm.UploadCharge))
151 { 151 {
152 if (client != null) 152 if (client != null)
153 client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); 153 client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
@@ -268,4 +268,4 @@ namespace OpenSim.Region.ClientStack.Linden
268 268
269 } 269 }
270 } 270 }
271} \ No newline at end of file 271}