summaryrefslogtreecommitdiff
path: root/indra/llinventory/llparcel.h
AgeCommit message (Collapse)Author
2015-11-10remove execute permission from many files that should not have itOz Linden
2014-05-16ACME-1459: Experience tab added to the about land tab for editing parcel ↵dolphin
Experiences
2014-05-01parcel experience lists can be manipulated through the ParcelAccessListUpdatedolphin
message
2013-09-03MAINT-3082 : Remove unused viewer LLParcel codesimon_linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-09-21MAINT-1601 Land remains for sale after purchasing for group.Kelly Washington
reviewed with Simon
2012-07-31merge up to latest viewer-developmentOz Linden
2012-06-11storm-1843: remove unused ParcelMediaURLFilter codeKadah_Coba
2012-04-06STORM-1839 Banlines need to be extended from 768 meters to 5000 meters now ↵Jonathan Yap
that explicit ban height has been changed.
2011-08-02Sh-2129 Viewer caps implementation for resource cost selected. Also cleanup ↵prep linden
of old code related to earlier accounting work.
2011-07-01ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcelsimon@lindenlab.com
Privacy" changes. Many naming changes for the featureto be "See avatars" instead of "hidden avatars". Also removed the "anyone can edit terrain" checkbox and slammed the value to FALSE.
2011-06-20ER-944: Add feature to control user sounds on a parcel. Added new checkboxessimon@lindenlab.com
to the About Land / Sound tab. Reviewed by Kelly.
2011-06-09ER-910: Parcel Privacy. Rename things in code to reflect feature name ↵Dave SIMmONs
change to "hidden avatars"
2011-06-08Merge latest from lindenlab/viewer-development/Dave SIMmONs
2011-05-24ER-914: Disable Parcel Privacy UI in viewer if on older simDave SIMmONs
2011-05-20SH-1252 and SH-1253 WIP.prep linden
2011-05-02ER-858: Add viewer checkbox to toggle parcel privacy settings. Reviewed by ↵Dave SIMmONs
Kelly
2011-03-07STORM-1037 : pull into viewer-developmentMerov Linden
2011-03-03storm-1037: remove the "hide url" checkboxes in parcel managementOz Linden
2011-02-07STORM-969 / ER-493 - Viewer side of the work to add 'Rentals' as a land type ↵Kent Quirk
to the parcel API
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-03-29EXT-5940 : Typedef all vector<LLUUID>'sLoren Shih
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29EXT-3075 : Remove swear words from comments across viewerLoren Shih
This bugs me in a minor way. Did a search-and-cleanup on various swear words.
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-07-24svn merge -r 127369:127511 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/landmark-permissions__merge__viewer2.0.0.3-r127280 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 includes post-merge fix for DEV-36563 : Remove mAcceptsCallingCardNames For DEV-36496 : Viewer merge for Landmark & Callingcard Permissions [VIEWER] For DEV-36563 : Remove mAcceptsCallingCardNames Test plans - EXTERNAL * [ Test against a 1.30 server ] * Test various permissions operations - both on items in inventory, and rezzed items and items that are embedded in objects. * Test creating landmarks. Test plans - INTERNAL * Test against any inventory permissions smoke tests. * See test plans in QAR-1644 for full Landmark&Callingcard Permissions test plan.
2009-07-24For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"Loren Shih
svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions.
2009-07-22Merge of Parcel API V1 to trunk for 1.30 release. Hallelujah!Monty Brandenberg
QAR-1687 Merge request for Parcel API project for 1.30 release svn merge -r127262:127300 svn+ssh://svn/svn/linden/branches/parcel-api/merge-qar-1687-parcel-api-2 trunk
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-05-18Result of svn merge -r119432:120464 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-02-25svn merge -r108815:112761 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 The biggest things in this are Scalable Space Servers and Maint-Server-6 QAR-1209 : SSS QAR-1295 : maint-server-6 Conflicts resolved by prospero: C scripts/farm_distribute C scripts/automated_build_scripts/build-linux.sh : resolved by prospero, mostly kept the merge-right version in the conflict, but there was one block of repeated code from earlier that I removed. C scripts/automated_build_scripts/build-mac.sh : kept merge-right C indra/llcommon/llversionserver.h : svn revert C indra/newsim/llsimparcel.h : kept *both*... working had "setArea", merge-right had exportStream and importStream C indra/newsim/llsimparcel.cpp : see llsimparcel.h C indra/newsim/lltask.h : working had LLTask derived also from LLScriptResourceConsumer, merge-right had LLTask dervied also from LLAgentPosition. To resolve conflict, derive from both. C indra/newsim/lllslmanager.h : kept merge-right (had an added comment) C indra/llmessage/llhttpnode.h : kept working (added the definition of method LLHTTPNode::extendedResult) C indra/lscript/lscript_execute_mono/llscriptexecutemono.cpp C indra/lscript/lscript_execute_mono/llscriptexecutemono.h : These two were resolved by si, in consultation with daveh I also had to add the following stubs to indra/newsim/tests/llgodkickutils_test.cpp in order to get it to compile: // LLScriptResourceConsumer interface methods in LLTask LLScriptResource::LLScriptResource() { } LLScriptResourcePool::LLScriptResourcePool() { } LLScriptResourcePool LLScriptResourcePool::null; LLScriptResourceConsumer::LLScriptResourceConsumer() { } LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() { return LLScriptResourcePool::null; } const LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() const { return LLScriptResourcePool::null; } bool LLScriptResourceConsumer::switchScriptResourcePools(LLScriptResourcePool& new_pool) { return false; } bool LLScriptResourceConsumer::canUseScriptResourcePool(const LLScriptResourcePool& resource_pool) { return false; } bool LLScriptResourceConsumer::isInPool(const LLScriptResourcePool& resource_pool) { return false; } void LLScriptResourceConsumer::setScriptResourcePool(LLScriptResourcePool& pool) { } S32 LLTask::getUsedPublicURLs() const { return 0; } void LLTask::setScriptResourcePool(LLScriptResourcePool& pool) { }
2009-02-24merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunkKelly Washington
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-07-15svn merge -r 90938:92097 ↵Jon Wolk
svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-06-07svn merge -r 88991:89027 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server --> release Due to the gnarly history of the source branch and merge history of release, combine with cmake header and gcc-fu, this was an "interesting" merge.
2008-02-14svn merge -r 79730:79944 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release QAR-275 Parcel Media Sam made me do it.
2007-11-15merge of age verification changes from QAR-76 to release; changes were ↵Kent Quirk
originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.
2007-11-01svn merge -r 72652:72881 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release QAR-11: pair-reviewed the merge w/ Sam.
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04Result of svn merge -r70873:71086 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
2007-07-02svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-06-13result of merge manually performed through diff and patch. svn diff ↵Aaron Brashears
svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
2007-05-08svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ↵Don Kjer
into release
2007-01-02Print done when done.James Cook