diff options
author | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-26 17:25:22 +0000 |
commit | 16b6738cdadc70966a93b6d025ae469738955dcb (patch) | |
tree | 7a3c0075e9ee5fd04d972bc52be38aec4d51f648 /OpenSim/Region/Environment/Modules/Avatar | |
parent | DNE code cleanups (diff) | |
download | opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.zip opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.gz opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.bz2 opensim-SC-16b6738cdadc70966a93b6d025ae469738955dcb.tar.xz |
* Patch from JHurliman
* Updates to libomv r2243,
* Remove lots of unnecessary typecasts
* Improves SendWindData()
Thanks jhurliman.
* Will update OpenSim-libs in 10 minutes..
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs index 8b7df9e..ea2fc04 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs | |||
@@ -298,7 +298,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
298 | int funds = 0; | 298 | int funds = 0; |
299 | 299 | ||
300 | Hashtable hbinfo = | 300 | Hashtable hbinfo = |
301 | GetBalanceForUserFromMoneyServer(client.AgentId, client.SecureSessionId, s.RegionInfo.originRegionID.ToString(), | 301 | GetBalanceForUserFromMoneyServer(client.AgentId, client.SecureSessionId, s.RegionInfo.originRegionID, |
302 | s.RegionInfo.regionSecret); | 302 | s.RegionInfo.regionSecret); |
303 | if ((bool) hbinfo["success"] == true) | 303 | if ((bool) hbinfo["success"] == true) |
304 | { | 304 | { |
@@ -722,7 +722,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
722 | if (m_MoneyAddress.Length > 0) | 722 | if (m_MoneyAddress.Length > 0) |
723 | { | 723 | { |
724 | Hashtable hbinfo = | 724 | Hashtable hbinfo = |
725 | GetBalanceForUserFromMoneyServer(aClient.AgentId, aClient.SecureSessionId, s.RegionInfo.originRegionID.ToString(), | 725 | GetBalanceForUserFromMoneyServer(aClient.AgentId, aClient.SecureSessionId, s.RegionInfo.originRegionID, |
726 | s.RegionInfo.regionSecret); | 726 | s.RegionInfo.regionSecret); |
727 | if ((bool) hbinfo["success"] == true) | 727 | if ((bool) hbinfo["success"] == true) |
728 | { | 728 | { |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs index ad0cac0..053eeef 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs | |||
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups | |||
67 | OpenSimulatorGroup.ActiveGroupTitle = "OpenSimulator Tester"; | 67 | OpenSimulatorGroup.ActiveGroupTitle = "OpenSimulator Tester"; |
68 | OpenSimulatorGroup.GroupID = opensimulatorGroupID; | 68 | OpenSimulatorGroup.GroupID = opensimulatorGroupID; |
69 | OpenSimulatorGroup.groupName = "OpenSimulator Testing"; | 69 | OpenSimulatorGroup.groupName = "OpenSimulator Testing"; |
70 | OpenSimulatorGroup.ActiveGroupPowers = GroupPowers.LandAllowSetHome; | 70 | OpenSimulatorGroup.ActiveGroupPowers = GroupPowers.AllowSetHome; |
71 | OpenSimulatorGroup.GroupTitles.Add("OpenSimulator Tester"); | 71 | OpenSimulatorGroup.GroupTitles.Add("OpenSimulator Tester"); |
72 | if (!m_groupUUIDGroup.ContainsKey(opensimulatorGroupID)) | 72 | if (!m_groupUUIDGroup.ContainsKey(opensimulatorGroupID)) |
73 | m_groupUUIDGroup.Add(opensimulatorGroupID, OpenSimulatorGroup); | 73 | m_groupUUIDGroup.Add(opensimulatorGroupID, OpenSimulatorGroup); |