aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-24 23:04:55 +0000
committerMelanie Thielker2008-10-24 23:04:55 +0000
commit64f9f03e9a3cb345ef85e1990bebc3a7cca41c9e (patch)
treea8398aa3c9234ff4d178ba2031e8180c605b1387 /OpenSim/Region/Environment/Modules
parent* minor: eliminate some mono compiler warnings (diff)
downloadopensim-SC_OLD-64f9f03e9a3cb345ef85e1990bebc3a7cca41c9e.zip
opensim-SC_OLD-64f9f03e9a3cb345ef85e1990bebc3a7cca41c9e.tar.gz
opensim-SC_OLD-64f9f03e9a3cb345ef85e1990bebc3a7cca41c9e.tar.bz2
opensim-SC_OLD-64f9f03e9a3cb345ef85e1990bebc3a7cca41c9e.tar.xz
Plumb some more
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs12
-rw-r--r--OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs4
3 files changed, 17 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 4de6fa2..fc1decf 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -187,6 +187,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
187 { 187 {
188 } 188 }
189 189
190 public void ApplyGroupCreationCharge(UUID agentID)
191 {
192 }
193
190 public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount) 194 public bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID, int amount)
191 { 195 {
192 string description = String.Format("Object {0} pays {1}", resolveObjectName(objectID), resolveAgentName(toID)); 196 string description = String.Format("Object {0} pays {1}", resolveObjectName(objectID), resolveAgentName(toID));
@@ -1512,6 +1516,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
1512 return true; 1516 return true;
1513 } 1517 }
1514 1518
1519 public bool GroupCreationCovered(IClientAPI client)
1520 {
1521 if (GetBalance(client) < PriceGroupCreate)
1522 return false;
1523
1524 return true;
1525 }
1526
1515 #endregion 1527 #endregion
1516 1528
1517 public void ObjectBuy(IClientAPI remoteClient, UUID agentID, 1529 public void ObjectBuy(IClientAPI remoteClient, UUID agentID,
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs
index 1e7eb59..0d0eed2 100644
--- a/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs
+++ b/OpenSim/Region/Environment/Modules/Framework/EventQueueHelper.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Environment
52 }; 52 };
53 } 53 }
54 54
55 private static LLSD buildEvent(string eventName, LLSD eventBody) 55 public static LLSD buildEvent(string eventName, LLSD eventBody)
56 { 56 {
57 LLSDMap llsdEvent = new LLSDMap(2); 57 LLSDMap llsdEvent = new LLSDMap(2);
58 llsdEvent.Add("message", new LLSDString(eventName)); 58 llsdEvent.Add("message", new LLSDString(eventName));
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 8617605..e2b035a 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -955,5 +955,9 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
955 public void SendDeclineCallingCard (UUID transactionID) 955 public void SendDeclineCallingCard (UUID transactionID)
956 { 956 {
957 } 957 }
958
959 public void SendAvatarGroupsReply(UUID avatarID, GroupMembershipData[] data)
960 {
961 }
958 } 962 }
959} 963}