Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
2262b13048
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -1,8 +1,29 @@
|
|||
// ******************************************************************
|
||||
// Copyright (c) 2008, 2009 Melanie Thielker
|
||||
//
|
||||
// All rights reserved
|
||||
//
|
||||
/*
|
||||
* Copyright (c) Contributors, http://opensimulator.org/
|
||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
* * Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* * Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* * Neither the name of the OpenSimulator Project nor the
|
||||
* names of its contributors may be used to endorse or promote products
|
||||
* derived from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue