ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Add SampleMoneyModule patch from mantis #2079

Browse Source 
* Thanks noralbion
This commit is contained in:
Justin Clarke Casey
2008-09-06 03:22:09 +00:00
parent 5446bdff09
commit bb2b1b1f61
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS.txt
View File

@@ -45,6 +45,7 @@ Patches
* alex_carnell
* webmage (IBM)
* jimbo2120 (IBM)
* nornalbion
* awebb (IBM)
* brianw/Sir_Ahzz
* ChrisDown
@@ -54,7 +55,7 @@ Patches
* A_Biondi
* lulurun
* Melanie Thielker
* John R Sohn(XenReborn)
* John R Sohn (XenReborn)
* Xantor
* YZh
* Grumly57

30
OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
View File

@@ -811,24 +811,33 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
LLUUID agentId = LLUUID.Zero;
LLUUID soundId = LLUUID.Zero;
LLUUID regionId = LLUUID.Zero;
Helpers.TryParse((string) requestData["agentId"], out agentId);
Helpers.TryParse((string) requestData["soundId"], out soundId);
Helpers.TryParse((string) requestData["regionId"], out regionId);
string text = (string) requestData["text"];
string secret = (string) requestData["secret"];
Scene userScene = GetRandomScene();
if (userScene.RegionInfo.regionSecret.ToString() == secret)
Scene userScene = GetSceneByUUID(regionId);
if(userScene != null)
{
IClientAPI client = LocateClientObject(agentId);
if (client != null)
if (userScene.RegionInfo.regionSecret.ToString() == secret)
{
if (soundId != LLUUID.Zero)
client.SendPlayAttachedSound(soundId, LLUUID.Zero, LLUUID.Zero, 1.0f, 0);
client.SendBlueBoxMessage(LLUUID.Zero, LLUUID.Zero, "", text);
retparam.Add("success", true);
}
IClientAPI client = LocateClientObject(agentId);
if (client != null)
{
if (soundId != LLUUID.Zero)
client.SendPlayAttachedSound(soundId, LLUUID.Zero, LLUUID.Zero, 1.0f, 0);
client.SendBlueBoxMessage(LLUUID.Zero, LLUUID.Zero, "", text);
retparam.Add("success", true);
}
else
{
retparam.Add("success", false);
}
}
else
{
retparam.Add("success", false);
@@ -839,7 +848,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
retparam.Add("success", false);
}
ret.Value = retparam;
return ret;
}