diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-25 01:02:22 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-25 01:02:22 +0300 |
| commit | 5aec46243b8150171e18a426312cd55facbd2c49 (patch) | |
| tree | 0af231e900445f3abf46458689a402b884623f6f /indra/newview/lllandmarkactions.cpp | |
| parent | a9b82b9d89aa3d0460d142fc520bc6a8ba79574e (diff) | |
| parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) | |
Merge branch 'master' into DRTVWR-540-maint
Diffstat (limited to 'indra/newview/lllandmarkactions.cpp')
| -rw-r--r-- | indra/newview/lllandmarkactions.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/indra/newview/lllandmarkactions.cpp b/indra/newview/lllandmarkactions.cpp index c243f8b4f0..a17dc674ac 100644 --- a/indra/newview/lllandmarkactions.cpp +++ b/indra/newview/lllandmarkactions.cpp @@ -228,23 +228,6 @@ LLViewerInventoryItem* LLLandmarkActions::findLandmarkForAgentPos() return findLandmarkForGlobalPos(gAgent.getPositionGlobal()); } -bool LLLandmarkActions::canCreateLandmarkHere() -{ - LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); - if(!agent_parcel) - { - LL_WARNS() << "No agent region" << LL_ENDL; - return false; - } - if (agent_parcel->getAllowLandmark() - || LLViewerParcelMgr::isParcelOwnedByAgent(agent_parcel, GP_LAND_ALLOW_LANDMARK)) - { - return true; - } - - return false; -} - void LLLandmarkActions::createLandmarkHere( const std::string& name, const std::string& desc, @@ -261,11 +244,6 @@ void LLLandmarkActions::createLandmarkHere( LL_WARNS() << "No agent parcel" << LL_ENDL; return; } - if (!canCreateLandmarkHere()) - { - LLNotificationsUtil::add("CannotCreateLandmarkNotOwner"); - return; - } create_inventory_item(gAgent.getID(), gAgent.getSessionID(), folder_id, LLTransactionID::tnull, |