OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2013-04-25 21:37:25 +01:00
parent 38bbf79e10 03c9d8ae4f
commit fb8aa22084
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/IClientAPI.cs
View File

@ -320,7 +320,7 @@ namespace OpenSim.Framework
public delegate void ObjectPermissions(
IClientAPI controller, UUID agentID, UUID sessionID, byte field, uint localId, uint mask, byte set);
public delegate void EconomyDataRequest(UUID agentID);
public delegate void EconomyDataRequest(IClientAPI client);
public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID);

2
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -9863,7 +9863,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
EconomyDataRequest handlerEconomoyDataRequest = OnEconomyDataRequest;
if (handlerEconomoyDataRequest != null)
{
handlerEconomoyDataRequest(AgentId);
handlerEconomoyDataRequest(this);
}
return true;
}

7
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
View File

@ -688,11 +688,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
/// Event called Economy Data Request handler.
/// </summary>
/// <param name="agentId"></param>
public void EconomyDataRequestHandler(UUID agentId)
{
IClientAPI user = LocateClientObject(agentId);
if (user != null)
public void EconomyDataRequestHandler(IClientAPI user)
{
Scene s = LocateSceneClientIn(user.AgentId);
@ -701,7 +697,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
TeleportMinPrice, TeleportPriceExponent);
}
}
private void ValidateLandBuy(Object osender, EventManager.LandBuyArgs e)
{