From b51534852f409bc02034ab2242bd4544d82392b2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 13 Aug 2010 21:07:45 +0100
Subject: minor: remove mono compiler warning
---
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/OptionalModules')
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 653f856..69ab33d 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
// private int m_stipend = 1000;
- private int ObjectCapacity = 45000;
+// private int ObjectCapacity = 45000;
private int ObjectCount = 0;
private int PriceEnergyUnit = 0;
private int PriceGroupCreate = 0;
--
cgit v1.1
From e89f0b3f71dc8bd439fcfc23d12b305369eac36b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 13 Aug 2010 22:29:42 +0100
Subject: refactor: move Scene.PerformObjectBuy into BuySellModule
---
.../World/MoneyModule/SampleMoneyModule.cs | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
(limited to 'OpenSim/Region/OptionalModules')
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 69ab33d..61cbb90 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -72,8 +72,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
private IConfigSource m_gConfig;
-
-
///
/// Region UUIDS indexed by AgentID
///
@@ -267,13 +265,11 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
PriceGroupCreate = startupConfig.GetInt("PriceGroupCreate", -1);
m_sellEnabled = startupConfig.GetBoolean("SellEnabled", false);
}
-
}
private void GetClientFunds(IClientAPI client)
{
CheckExistAndRefreshFunds(client.AgentId);
-
}
///
@@ -815,7 +811,10 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
remoteClient.SendAgentAlertMessage("Unable to buy now. The object was not found.", false);
return;
}
- s.PerformObjectBuy(remoteClient, categoryID, localID, saleType);
+
+ IBuySellModule module = s.RequestModuleInterface();
+ if (module != null)
+ module.BuyObject(remoteClient, categoryID, localID, saleType);
}
}
@@ -825,7 +824,5 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
RegionMoneyRequest = 1,
Gift = 2,
Purchase = 3
- }
-
-
-}
+ }
+}
\ No newline at end of file
--
cgit v1.1
From 77de28965ae5fc6de3c60a28ce7d4e59643a2a70 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 16 Aug 2010 11:33:59 -0700
Subject: Work on TeleportStart: renamed method from TeleportLocationStart to
TeleportStart, and now sending this upon all teleports, not just some, and in
the right place (EntityTransferModule).
---
.../Agent/InternetRelayClientView/Server/IRCClientView.cs | 2 +-
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/OptionalModules')
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index ee7aa2da..19bb002 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1035,7 +1035,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
- public void SendTeleportLocationStart()
+ public void SendTeleportStart(uint flags)
{
}
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 2e0450c..944bac6 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -611,7 +611,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
{
}
- public virtual void SendTeleportLocationStart()
+ public virtual void SendTeleportStart(uint flags)
{
}
--
cgit v1.1
From a8b80ef800e78d9fa321bc2388b4d8336f454b1d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 16 Aug 2010 11:39:46 -0700
Subject: Added SendTeleportProgress to IClientAPI. Ya know what that means...
8 files affected.
---
.../Agent/InternetRelayClientView/Server/IRCClientView.cs | 4 ++++
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 4 ++++
2 files changed, 8 insertions(+)
(limited to 'OpenSim/Region/OptionalModules')
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 19bb002..6793ef6 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1040,6 +1040,10 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
}
+ public void SendTeleportProgress(uint flags, string message)
+ {
+ }
+
public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance)
{
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 944bac6..fae12b6 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -615,6 +615,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
{
}
+ public virtual void SendTeleportProgress(uint flags, string message)
+ {
+ }
+
public virtual void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance)
{
}
--
cgit v1.1
From a8c0b131f9aa62d4b6260fd37f89014e55b457cf Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 17 Aug 2010 13:50:04 -0700
Subject: * Changed a few OSD.FromBinary() calls to the more accurate
OSD.FromULong() to fix the build
---
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/OptionalModules')
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 3f15b69..2969503 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1129,7 +1129,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
OSDMap NewGroupDataMap = new OSDMap(1);
GroupDataMap.Add("GroupID", OSD.FromUUID(membership.GroupID));
- GroupDataMap.Add("GroupPowers", OSD.FromBinary(membership.GroupPowers));
+ GroupDataMap.Add("GroupPowers", OSD.FromULong(membership.GroupPowers));
GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(membership.AcceptNotices));
GroupDataMap.Add("GroupInsigniaID", OSD.FromUUID(membership.GroupPicture));
GroupDataMap.Add("Contribution", OSD.FromInteger(membership.Contribution));
--
cgit v1.1