* 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.0.6.0-stable
parent
244bfcde5b
commit
75df0c9000
|
@ -54,7 +54,7 @@ namespace OpenSim.Framework
|
||||||
string[] parts = temp.Split('\n');
|
string[] parts = temp.Split('\n');
|
||||||
int.TryParse(parts[0].Substring(17, 1), out Version);
|
int.TryParse(parts[0].Substring(17, 1), out Version);
|
||||||
LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID);
|
LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID);
|
||||||
LLVector3.TryParse(parts[2].Substring(11, parts[2].Length - 11), out Position);
|
LLVector3.TryParse(parts[2].Substring(10, parts[2].Length - 10), out Position);
|
||||||
ulong.TryParse(parts[3].Substring(14, parts[3].Length - 14), out RegionHandle);
|
ulong.TryParse(parts[3].Substring(14, parts[3].Length - 14), out RegionHandle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -446,7 +446,7 @@ namespace OpenSim.Region.Environment.Modules
|
||||||
IClientAPI sender = null;
|
IClientAPI sender = null;
|
||||||
IClientAPI receiver = null;
|
IClientAPI receiver = null;
|
||||||
|
|
||||||
m_log.WarnFormat("[MONEY] Explicit transfer of {0} from {1} to {2}", e.amount, e.sender.ToString(), e.receiver.ToString());
|
//m_log.WarnFormat("[MONEY] Explicit transfer of {0} from {1} to {2}", e.amount, e.sender.ToString(), e.receiver.ToString());
|
||||||
|
|
||||||
sender = LocateClientObject(e.sender);
|
sender = LocateClientObject(e.sender);
|
||||||
if (sender != null)
|
if (sender != null)
|
||||||
|
@ -638,7 +638,7 @@ namespace OpenSim.Region.Environment.Modules
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
private bool doMoneyTransfer(LLUUID Sender, LLUUID Receiver, int amount)
|
private bool doMoneyTransfer(LLUUID Sender, LLUUID Receiver, int amount)
|
||||||
{
|
{
|
||||||
m_log.WarnFormat("[MONEY] Transfer {0} from {1} to {2}", amount, Sender.ToString(), Receiver.ToString());
|
//m_log.WarnFormat("[MONEY] Transfer {0} from {1} to {2}", amount, Sender.ToString(), Receiver.ToString());
|
||||||
|
|
||||||
bool result = false;
|
bool result = false;
|
||||||
if (amount >= 0)
|
if (amount >= 0)
|
||||||
|
|
Loading…
Reference in New Issue