summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/CMakeLists.txt2
-rw-r--r--indra/llinventory/lleconomy.cpp287
-rw-r--r--indra/llinventory/lleconomy.h157
3 files changed, 0 insertions, 446 deletions
diff --git a/indra/llinventory/CMakeLists.txt b/indra/llinventory/CMakeLists.txt
index f1bc28427d..e829788c91 100644
--- a/indra/llinventory/CMakeLists.txt
+++ b/indra/llinventory/CMakeLists.txt
@@ -19,7 +19,6 @@ include_directories(
set(llinventory_SOURCE_FILES
llcategory.cpp
- lleconomy.cpp
llfoldertype.cpp
llinventory.cpp
llinventorydefines.cpp
@@ -42,7 +41,6 @@ set(llinventory_HEADER_FILES
CMakeLists.txt
llcategory.h
- lleconomy.h
llfoldertype.h
llinventory.h
llinventorydefines.h
diff --git a/indra/llinventory/lleconomy.cpp b/indra/llinventory/lleconomy.cpp
deleted file mode 100644
index 2a023d8c24..0000000000
--- a/indra/llinventory/lleconomy.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-/**
- * @file lleconomy.cpp
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#include "linden_common.h"
-
-#include "lleconomy.h"
-#include "llerror.h"
-#include "message.h"
-#include "v3math.h"
-
-
-LLBaseEconomy::LLBaseEconomy()
-: mObjectCount( -1 ),
- mObjectCapacity( -1 ),
- mPriceObjectClaim( -1 ),
- mPricePublicObjectDecay( -1 ),
- mPricePublicObjectDelete( -1 ),
- mPriceEnergyUnit( -1 ),
- mPriceUpload( -1 ),
- mPriceRentLight( -1 ),
- mTeleportMinPrice( -1 ),
- mTeleportPriceExponent( -1 ),
- mPriceGroupCreate( -1 )
-{ }
-
-LLBaseEconomy::~LLBaseEconomy()
-{ }
-
-void LLBaseEconomy::addObserver(LLEconomyObserver* observer)
-{
- mObservers.push_back(observer);
-}
-
-void LLBaseEconomy::removeObserver(LLEconomyObserver* observer)
-{
- std::list<LLEconomyObserver*>::iterator it =
- std::find(mObservers.begin(), mObservers.end(), observer);
- if (it != mObservers.end())
- {
- mObservers.erase(it);
- }
-}
-
-void LLBaseEconomy::notifyObservers()
-{
- for (std::list<LLEconomyObserver*>::iterator it = mObservers.begin();
- it != mObservers.end();
- ++it)
- {
- (*it)->onEconomyDataChange();
- }
-}
-
-// static
-void LLBaseEconomy::processEconomyData(LLMessageSystem *msg, LLBaseEconomy* econ_data)
-{
- S32 i;
- F32 f;
-
- msg->getS32Fast(_PREHASH_Info, _PREHASH_ObjectCapacity, i);
- econ_data->setObjectCapacity(i);
- msg->getS32Fast(_PREHASH_Info, _PREHASH_ObjectCount, i);
- econ_data->setObjectCount(i);
- msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceEnergyUnit, i);
- econ_data->setPriceEnergyUnit(i);
- msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceObjectClaim, i);
- econ_data->setPriceObjectClaim(i);
- msg->getS32Fast(_PREHASH_Info, _PREHASH_PricePublicObjectDecay, i);
- econ_data->setPricePublicObjectDecay(i);
- msg->getS32Fast(_PREHASH_Info, _PREHASH_PricePublicObjectDelete, i);
- econ_data->setPricePublicObjectDelete(i);
- msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceUpload, i);
- econ_data->setPriceUpload(i);
-#if LL_LINUX
- // We can optionally fake the received upload price for testing.
- // Note that the server is within its rights to not obey our fake
- // price. :)
- const char* fakeprice_str = getenv("LL_FAKE_UPLOAD_PRICE");
- if (fakeprice_str)
- {
- S32 fakeprice = (S32)atoi(fakeprice_str);
- LL_WARNS() << "LL_FAKE_UPLOAD_PRICE: Faking upload price as L$" << fakeprice << LL_ENDL;
- econ_data->setPriceUpload(fakeprice);
- }
-#endif
- msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceRentLight, i);
- econ_data->setPriceRentLight(i);
- msg->getS32Fast(_PREHASH_Info, _PREHASH_TeleportMinPrice, i);
- econ_data->setTeleportMinPrice(i);
- msg->getF32Fast(_PREHASH_Info, _PREHASH_TeleportPriceExponent, f);
- econ_data->setTeleportPriceExponent(f);
- msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceGroupCreate, i);
- econ_data->setPriceGroupCreate(i);
-
- econ_data->notifyObservers();
-}
-
-S32 LLBaseEconomy::calculateTeleportCost(F32 distance) const
-{
- S32 min_cost = getTeleportMinPrice();
- F32 exponent = getTeleportPriceExponent();
- F32 divisor = 100.f * pow(3.f, exponent);
- S32 cost = (U32)(distance * pow(log10(distance), exponent) / divisor);
- if (cost < 0)
- {
- cost = 0;
- }
- else if (cost < min_cost)
- {
- cost = min_cost;
- }
-
- return cost;
-}
-
-S32 LLBaseEconomy::calculateLightRent(const LLVector3& object_size) const
-{
- F32 intensity_mod = llmax(object_size.magVec(), 1.f);
- return (S32)(intensity_mod * getPriceRentLight());
-}
-
-void LLBaseEconomy::print()
-{
- LL_INFOS() << "Global Economy Settings: " << LL_ENDL;
- LL_INFOS() << "Object Capacity: " << mObjectCapacity << LL_ENDL;
- LL_INFOS() << "Object Count: " << mObjectCount << LL_ENDL;
- LL_INFOS() << "Claim Price Per Object: " << mPriceObjectClaim << LL_ENDL;
- LL_INFOS() << "Claim Price Per Public Object: " << mPricePublicObjectDecay << LL_ENDL;
- LL_INFOS() << "Delete Price Per Public Object: " << mPricePublicObjectDelete << LL_ENDL;
- LL_INFOS() << "Release Price Per Public Object: " << getPricePublicObjectRelease() << LL_ENDL;
- LL_INFOS() << "Price Per Energy Unit: " << mPriceEnergyUnit << LL_ENDL;
- LL_INFOS() << "Price Per Upload: " << mPriceUpload << LL_ENDL;
- LL_INFOS() << "Light Base Price: " << mPriceRentLight << LL_ENDL;
- LL_INFOS() << "Teleport Min Price: " << mTeleportMinPrice << LL_ENDL;
- LL_INFOS() << "Teleport Price Exponent: " << mTeleportPriceExponent << LL_ENDL;
- LL_INFOS() << "Price for group creation: " << mPriceGroupCreate << LL_ENDL;
-}
-
-LLRegionEconomy::LLRegionEconomy()
-: mPriceObjectRent( -1.f ),
- mPriceObjectScaleFactor( -1.f ),
- mEnergyEfficiency( -1.f ),
- mBasePriceParcelClaimDefault(-1),
- mBasePriceParcelClaimActual(-1),
- mPriceParcelClaimFactor(-1.f),
- mBasePriceParcelRent(-1),
- mAreaOwned(-1.f),
- mAreaTotal(-1.f)
-{ }
-
-LLRegionEconomy::~LLRegionEconomy()
-{ }
-
-BOOL LLRegionEconomy::hasData() const
-{
- return (mBasePriceParcelRent != -1);
-}
-
-// static
-void LLRegionEconomy::processEconomyData(LLMessageSystem *msg, void** user_data)
-{
- S32 i;
- F32 f;
-
- LLRegionEconomy *this_ptr = (LLRegionEconomy*)user_data;
-
- LLBaseEconomy::processEconomyData(msg, this_ptr);
-
- msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceParcelClaim, i);
- this_ptr->setBasePriceParcelClaimDefault(i);
- msg->getF32(_PREHASH_Info, _PREHASH_PriceParcelClaimFactor, f);
- this_ptr->setPriceParcelClaimFactor(f);
- msg->getF32Fast(_PREHASH_Info, _PREHASH_EnergyEfficiency, f);
- this_ptr->setEnergyEfficiency(f);
- msg->getF32Fast(_PREHASH_Info, _PREHASH_PriceObjectRent, f);
- this_ptr->setPriceObjectRent(f);
- msg->getF32Fast(_PREHASH_Info, _PREHASH_PriceObjectScaleFactor, f);
- this_ptr->setPriceObjectScaleFactor(f);
- msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceParcelRent, i);
- this_ptr->setBasePriceParcelRent(i);
-}
-
-// static
-void LLRegionEconomy::processEconomyDataRequest(LLMessageSystem *msg, void **user_data)
-{
- LLRegionEconomy *this_ptr = (LLRegionEconomy*)user_data;
- if (!this_ptr->hasData())
- {
- LL_WARNS() << "Dropping EconomyDataRequest, because EconomyData message "
- << "has not been processed" << LL_ENDL;
- }
-
- msg->newMessageFast(_PREHASH_EconomyData);
- msg->nextBlockFast(_PREHASH_Info);
- msg->addS32Fast(_PREHASH_ObjectCapacity, this_ptr->getObjectCapacity());
- msg->addS32Fast(_PREHASH_ObjectCount, this_ptr->getObjectCount());
- msg->addS32Fast(_PREHASH_PriceEnergyUnit, this_ptr->getPriceEnergyUnit());
- msg->addS32Fast(_PREHASH_PriceObjectClaim, this_ptr->getPriceObjectClaim());
- msg->addS32Fast(_PREHASH_PricePublicObjectDecay, this_ptr->getPricePublicObjectDecay());
- msg->addS32Fast(_PREHASH_PricePublicObjectDelete, this_ptr->getPricePublicObjectDelete());
- msg->addS32Fast(_PREHASH_PriceParcelClaim, this_ptr->mBasePriceParcelClaimActual);
- msg->addF32Fast(_PREHASH_PriceParcelClaimFactor, this_ptr->mPriceParcelClaimFactor);
- msg->addS32Fast(_PREHASH_PriceUpload, this_ptr->getPriceUpload());
- msg->addS32Fast(_PREHASH_PriceRentLight, this_ptr->getPriceRentLight());
- msg->addS32Fast(_PREHASH_TeleportMinPrice, this_ptr->getTeleportMinPrice());
- msg->addF32Fast(_PREHASH_TeleportPriceExponent, this_ptr->getTeleportPriceExponent());
-
- msg->addF32Fast(_PREHASH_EnergyEfficiency, this_ptr->getEnergyEfficiency());
- msg->addF32Fast(_PREHASH_PriceObjectRent, this_ptr->getPriceObjectRent());
- msg->addF32Fast(_PREHASH_PriceObjectScaleFactor, this_ptr->getPriceObjectScaleFactor());
- msg->addS32Fast(_PREHASH_PriceParcelRent, this_ptr->getPriceParcelRent());
- msg->addS32Fast(_PREHASH_PriceGroupCreate, this_ptr->getPriceGroupCreate());
-
- msg->sendReliable(msg->getSender());
-}
-
-
-S32 LLRegionEconomy::getPriceParcelClaim() const
-{
- //return (S32)((F32)mBasePriceParcelClaim * (mAreaTotal / (mAreaTotal - mAreaOwned)));
- return (S32)((F32)mBasePriceParcelClaimActual * mPriceParcelClaimFactor);
-}
-
-S32 LLRegionEconomy::getPriceParcelRent() const
-{
- return mBasePriceParcelRent;
-}
-
-
-void LLRegionEconomy::print()
-{
- this->LLBaseEconomy::print();
-
- LL_INFOS() << "Region Economy Settings: " << LL_ENDL;
- LL_INFOS() << "Land (square meters): " << mAreaTotal << LL_ENDL;
- LL_INFOS() << "Owned Land (square meters): " << mAreaOwned << LL_ENDL;
- LL_INFOS() << "Daily Object Rent: " << mPriceObjectRent << LL_ENDL;
- LL_INFOS() << "Daily Land Rent (per meter): " << getPriceParcelRent() << LL_ENDL;
- LL_INFOS() << "Energey Efficiency: " << mEnergyEfficiency << LL_ENDL;
-}
-
-
-void LLRegionEconomy::setBasePriceParcelClaimDefault(S32 val)
-{
- mBasePriceParcelClaimDefault = val;
- if(mBasePriceParcelClaimActual == -1)
- {
- mBasePriceParcelClaimActual = val;
- }
-}
-
-void LLRegionEconomy::setBasePriceParcelClaimActual(S32 val)
-{
- mBasePriceParcelClaimActual = val;
-}
-
-void LLRegionEconomy::setPriceParcelClaimFactor(F32 val)
-{
- mPriceParcelClaimFactor = val;
-}
-
-void LLRegionEconomy::setBasePriceParcelRent(S32 val)
-{
- mBasePriceParcelRent = val;
-}
diff --git a/indra/llinventory/lleconomy.h b/indra/llinventory/lleconomy.h
deleted file mode 100644
index cdfde171c1..0000000000
--- a/indra/llinventory/lleconomy.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * @file lleconomy.h
- *
- * $LicenseInfo:firstyear=2002&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLECONOMY_H
-#define LL_LLECONOMY_H
-
-#include "llsingleton.h"
-#include <list>
-
-class LLMessageSystem;
-class LLVector3;
-
-/**
- * Register an observer to be notified of economy data updates coming from server.
- */
-class LLEconomyObserver
-{
-public:
- virtual ~LLEconomyObserver() {}
- virtual void onEconomyDataChange() = 0;
-};
-
-class LLBaseEconomy
-{
-public:
- LLBaseEconomy();
- virtual ~LLBaseEconomy();
-
- virtual void print();
-
- void addObserver(LLEconomyObserver* observer);
- void removeObserver(LLEconomyObserver* observer);
- void notifyObservers();
-
- static void processEconomyData(LLMessageSystem *msg, LLBaseEconomy* econ_data);
-
- S32 calculateTeleportCost(F32 distance) const;
- S32 calculateLightRent(const LLVector3& object_size) const;
-
- S32 getObjectCount() const { return mObjectCount; }
- S32 getObjectCapacity() const { return mObjectCapacity; }
- S32 getPriceObjectClaim() const { return mPriceObjectClaim; }
- S32 getPricePublicObjectDecay() const { return mPricePublicObjectDecay; }
- S32 getPricePublicObjectDelete() const { return mPricePublicObjectDelete; }
- S32 getPricePublicObjectRelease() const { return mPriceObjectClaim - mPricePublicObjectDelete; }
- S32 getPriceEnergyUnit() const { return mPriceEnergyUnit; }
- S32 getPriceUpload() const { return mPriceUpload; }
- S32 getPriceRentLight() const { return mPriceRentLight; }
- S32 getTeleportMinPrice() const { return mTeleportMinPrice; }
- F32 getTeleportPriceExponent() const { return mTeleportPriceExponent; }
- S32 getPriceGroupCreate() const { return mPriceGroupCreate; }
-
-
- void setObjectCount(S32 val) { mObjectCount = val; }
- void setObjectCapacity(S32 val) { mObjectCapacity = val; }
- void setPriceObjectClaim(S32 val) { mPriceObjectClaim = val; }
- void setPricePublicObjectDecay(S32 val) { mPricePublicObjectDecay = val; }
- void setPricePublicObjectDelete(S32 val) { mPricePublicObjectDelete = val; }
- void setPriceEnergyUnit(S32 val) { mPriceEnergyUnit = val; }
- void setPriceUpload(S32 val) { mPriceUpload = val; }
- void setPriceRentLight(S32 val) { mPriceRentLight = val; }
- void setTeleportMinPrice(S32 val) { mTeleportMinPrice = val; }
- void setTeleportPriceExponent(F32 val) { mTeleportPriceExponent = val; }
- void setPriceGroupCreate(S32 val) { mPriceGroupCreate = val; }
-
-private:
- S32 mObjectCount;
- S32 mObjectCapacity;
- S32 mPriceObjectClaim; // per primitive
- S32 mPricePublicObjectDecay; // per primitive
- S32 mPricePublicObjectDelete; // per primitive
- S32 mPriceEnergyUnit;
- S32 mPriceUpload;
- S32 mPriceRentLight;
- S32 mTeleportMinPrice;
- F32 mTeleportPriceExponent;
- S32 mPriceGroupCreate;
-
- std::list<LLEconomyObserver*> mObservers;
-};
-
-class LLGlobalEconomy: public LLSingleton<LLGlobalEconomy>, public LLBaseEconomy
-{
- LLSINGLETON_EMPTY_CTOR(LLGlobalEconomy);
-};
-
-class LLRegionEconomy : public LLBaseEconomy
-{
-public:
- LLRegionEconomy();
- ~LLRegionEconomy();
-
- static void processEconomyData(LLMessageSystem *msg, void **user_data);
- static void processEconomyDataRequest(LLMessageSystem *msg, void **user_data);
-
- void print();
-
- BOOL hasData() const;
- F32 getPriceObjectRent() const { return mPriceObjectRent; }
- F32 getPriceObjectScaleFactor() const {return mPriceObjectScaleFactor;}
- F32 getEnergyEfficiency() const { return mEnergyEfficiency; }
- S32 getPriceParcelClaim() const;
- S32 getPriceParcelRent() const;
- F32 getAreaOwned() const { return mAreaOwned; }
- F32 getAreaTotal() const { return mAreaTotal; }
- S32 getBasePriceParcelClaimActual() const { return mBasePriceParcelClaimActual; }
-
- void setPriceObjectRent(F32 val) { mPriceObjectRent = val; }
- void setPriceObjectScaleFactor(F32 val) { mPriceObjectScaleFactor = val; }
- void setEnergyEfficiency(F32 val) { mEnergyEfficiency = val; }
-
- void setBasePriceParcelClaimDefault(S32 val);
- void setBasePriceParcelClaimActual(S32 val);
- void setPriceParcelClaimFactor(F32 val);
- void setBasePriceParcelRent(S32 val);
-
- void setAreaOwned(F32 val) { mAreaOwned = val; }
- void setAreaTotal(F32 val) { mAreaTotal = val; }
-
-private:
- F32 mPriceObjectRent;
- F32 mPriceObjectScaleFactor;
- F32 mEnergyEfficiency;
-
- S32 mBasePriceParcelClaimDefault;
- S32 mBasePriceParcelClaimActual;
- F32 mPriceParcelClaimFactor;
- S32 mBasePriceParcelRent;
-
- F32 mAreaOwned;
- F32 mAreaTotal;
-
-};
-
-#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 09:02:23 +0000