Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID.
Sending the reply requires having the IClientAPI.user_profiles
parent
5d0a8ff391
commit
03c9d8ae4f
|
@ -313,7 +313,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);
|
||||
|
||||
|
|
|
@ -9682,7 +9682,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
EconomyDataRequest handlerEconomoyDataRequest = OnEconomyDataRequest;
|
||||
if (handlerEconomoyDataRequest != null)
|
||||
{
|
||||
handlerEconomoyDataRequest(AgentId);
|
||||
handlerEconomoyDataRequest(this);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -688,19 +688,14 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
|
|||
/// Event called Economy Data Request handler.
|
||||
/// </summary>
|
||||
/// <param name="agentId"></param>
|
||||
public void EconomyDataRequestHandler(UUID agentId)
|
||||
public void EconomyDataRequestHandler(IClientAPI user)
|
||||
{
|
||||
IClientAPI user = LocateClientObject(agentId);
|
||||
Scene s = LocateSceneClientIn(user.AgentId);
|
||||
|
||||
if (user != null)
|
||||
{
|
||||
Scene s = LocateSceneClientIn(user.AgentId);
|
||||
|
||||
user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
|
||||
PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
|
||||
PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
|
||||
TeleportMinPrice, TeleportPriceExponent);
|
||||
}
|
||||
user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
|
||||
PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
|
||||
PriceParcelRent, PricePublicObjectDecay, PricePublicObjectDelete, PriceRentLight, PriceUpload,
|
||||
TeleportMinPrice, TeleportPriceExponent);
|
||||
}
|
||||
|
||||
private void ValidateLandBuy(Object osender, EventManager.LandBuyArgs e)
|
||||
|
|
Loading…
Reference in New Issue