diff options
author | Teravus Ovares | 2008-04-17 05:23:43 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-04-17 05:23:43 +0000 |
commit | 75df0c9000b6001209765e8a75935e22ee9b7d4a (patch) | |
tree | 117555e69ded678fa4d2c8e4034e6470e33cd5f8 /OpenSim | |
parent | * Implements 'Set Home to Here' (diff) | |
download | opensim-SC_OLD-75df0c9000b6001209765e8a75935e22ee9b7d4a.zip opensim-SC_OLD-75df0c9000b6001209765e8a75935e22ee9b7d4a.tar.gz opensim-SC_OLD-75df0c9000b6001209765e8a75935e22ee9b7d4a.tar.bz2 opensim-SC_OLD-75df0c9000b6001209765e8a75935e22ee9b7d4a.tar.xz |
* Patch from ChrisDown to fix odd results when using landmarks. Thanks Chris! (Tweaked slightly so avatar don't end up underground).
* Removed some testing notices I had in there that were obnoxious.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Framework/AssetLandmark.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs index e0f5415..974a632 100644 --- a/OpenSim/Framework/AssetLandmark.cs +++ b/OpenSim/Framework/AssetLandmark.cs | |||
@@ -54,7 +54,7 @@ namespace OpenSim.Framework | |||
54 | string[] parts = temp.Split('\n'); | 54 | string[] parts = temp.Split('\n'); |
55 | int.TryParse(parts[0].Substring(17, 1), out Version); | 55 | int.TryParse(parts[0].Substring(17, 1), out Version); |
56 | LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID); | 56 | LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID); |
57 | LLVector3.TryParse(parts[2].Substring(11, parts[2].Length - 11), out Position); | 57 | LLVector3.TryParse(parts[2].Substring(10, parts[2].Length - 10), out Position); |
58 | ulong.TryParse(parts[3].Substring(14, parts[3].Length - 14), out RegionHandle); | 58 | ulong.TryParse(parts[3].Substring(14, parts[3].Length - 14), out RegionHandle); |
59 | } | 59 | } |
60 | } | 60 | } |
diff --git a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs index 9727a8b..5c1c938 100644 --- a/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs +++ b/OpenSim/Region/Environment/Modules/BetaGridLikeMoneyModule.cs | |||
@@ -446,7 +446,7 @@ namespace OpenSim.Region.Environment.Modules | |||
446 | IClientAPI sender = null; | 446 | IClientAPI sender = null; |
447 | IClientAPI receiver = null; | 447 | IClientAPI receiver = null; |
448 | 448 | ||
449 | m_log.WarnFormat("[MONEY] Explicit transfer of {0} from {1} to {2}", e.amount, e.sender.ToString(), e.receiver.ToString()); | 449 | //m_log.WarnFormat("[MONEY] Explicit transfer of {0} from {1} to {2}", e.amount, e.sender.ToString(), e.receiver.ToString()); |
450 | 450 | ||
451 | sender = LocateClientObject(e.sender); | 451 | sender = LocateClientObject(e.sender); |
452 | if (sender != null) | 452 | if (sender != null) |
@@ -638,7 +638,7 @@ namespace OpenSim.Region.Environment.Modules | |||
638 | /// <returns></returns> | 638 | /// <returns></returns> |
639 | private bool doMoneyTransfer(LLUUID Sender, LLUUID Receiver, int amount) | 639 | private bool doMoneyTransfer(LLUUID Sender, LLUUID Receiver, int amount) |
640 | { | 640 | { |
641 | m_log.WarnFormat("[MONEY] Transfer {0} from {1} to {2}", amount, Sender.ToString(), Receiver.ToString()); | 641 | //m_log.WarnFormat("[MONEY] Transfer {0} from {1} to {2}", amount, Sender.ToString(), Receiver.ToString()); |
642 | 642 | ||
643 | bool result = false; | 643 | bool result = false; |
644 | if (amount >= 0) | 644 | if (amount >= 0) |