* Add SampleMoneyModule patch from mantis #2079

* Thanks noralbion
0.6.0-stable
Justin Clarke Casey 2008-09-06 03:22:09 +00:00
parent 5446bdff09
commit bb2b1b1f61
2 changed files with 21 additions and 12 deletions

View File

@ -45,6 +45,7 @@ Patches
* alex_carnell * alex_carnell
* webmage (IBM) * webmage (IBM)
* jimbo2120 (IBM) * jimbo2120 (IBM)
* nornalbion
* awebb (IBM) * awebb (IBM)
* brianw/Sir_Ahzz * brianw/Sir_Ahzz
* ChrisDown * ChrisDown

View File

@ -811,17 +811,21 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
LLUUID agentId = LLUUID.Zero; LLUUID agentId = LLUUID.Zero;
LLUUID soundId = LLUUID.Zero; LLUUID soundId = LLUUID.Zero;
LLUUID regionId = LLUUID.Zero;
Helpers.TryParse((string) requestData["agentId"], out agentId); Helpers.TryParse((string) requestData["agentId"], out agentId);
Helpers.TryParse((string) requestData["soundId"], out soundId); Helpers.TryParse((string) requestData["soundId"], out soundId);
Helpers.TryParse((string) requestData["regionId"], out regionId);
string text = (string) requestData["text"]; string text = (string) requestData["text"];
string secret = (string) requestData["secret"]; string secret = (string) requestData["secret"];
Scene userScene = GetRandomScene(); Scene userScene = GetSceneByUUID(regionId);
if(userScene != null)
{
if (userScene.RegionInfo.regionSecret.ToString() == secret) if (userScene.RegionInfo.regionSecret.ToString() == secret)
{ {
IClientAPI client = LocateClientObject(agentId);
IClientAPI client = LocateClientObject(agentId);
if (client != null) if (client != null)
{ {
if (soundId != LLUUID.Zero) if (soundId != LLUUID.Zero)
@ -838,8 +842,12 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
{ {
retparam.Add("success", false); retparam.Add("success", false);
} }
}
else
{
retparam.Add("success", false);
}
ret.Value = retparam; ret.Value = retparam;
return ret; return ret;
} }