summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterland.h
AgeCommit message (Collapse)Author
2024-05-22Fix line endlingsAnsariel
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# Conflicts: # autobuild.xml # indra/cmake/CMakeLists.txt # indra/cmake/GoogleMock.cmake # indra/llaudio/llaudioengine_fmodstudio.cpp # indra/llaudio/llaudioengine_fmodstudio.h # indra/llaudio/lllistener_fmodstudio.cpp # indra/llaudio/lllistener_fmodstudio.h # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/llaudio/llstreamingaudio_fmodstudio.h # indra/llcharacter/llmultigesture.cpp # indra/llcharacter/llmultigesture.h # indra/llimage/llimage.cpp # indra/llimage/llimagepng.cpp # indra/llimage/llimageworker.cpp # indra/llimage/tests/llimageworker_test.cpp # indra/llmessage/tests/llmockhttpclient.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llfontfreetype.cpp # indra/llui/llcombobox.cpp # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.h # indra/llui/lllineeditor.cpp # indra/llui/lllineeditor.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltextvalidate.cpp # indra/llui/lltextvalidate.h # indra/llui/lluictrl.h # indra/llui/llview.cpp # indra/llwindow/llwindowmacosx.cpp # indra/newview/app_settings/settings.xml # indra/newview/llappearancemgr.cpp # indra/newview/llappearancemgr.h # indra/newview/llavatarpropertiesprocessor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llbreadcrumbview.cpp # indra/newview/llbreadcrumbview.h # indra/newview/llbreastmotion.cpp # indra/newview/llbreastmotion.h # indra/newview/llconversationmodel.h # indra/newview/lldensityctrl.cpp # indra/newview/lldensityctrl.h # indra/newview/llface.inl # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llfloateremojipicker.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/llfloaterprofiletexture.h # indra/newview/llgesturemgr.cpp # indra/newview/llgesturemgr.h # indra/newview/llimpanel.cpp # indra/newview/llimpanel.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryclipboard.cpp # indra/newview/llinventoryclipboard.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorygallery.cpp # indra/newview/lllistbrowser.cpp # indra/newview/lllistbrowser.h # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofile.h # indra/newview/llpreviewgesture.cpp # indra/newview/llsavedsettingsglue.cpp # indra/newview/llsavedsettingsglue.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llurllineeditorctrl.cpp # indra/newview/llvectorperfoptions.cpp # indra/newview/llvectorperfoptions.h # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/macmain.h # indra/test/test.cpp
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-02-21Convert remaining BOOL to boolAnsariel
2024-02-21Convert BOOL to bool in lluiAnsariel
2022-03-30SL-16668 Enable/disable appropriate menu items in context menuMnikolenko Productengine
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-04-17Merge 6.2.1Graham Linden
2018-09-14SL-1956 added support for temporary bans to parcel ban listAndreyL ProductEngine
2019-04-25SL-10989 Disable text label when you don't have appropriate permissions.maxim_productengine
2019-04-19SL-10989 Toggle checkbox when clicking 'Avatars on other parcels can see and ↵maxim_productengine
chat...' label
2018-01-23MAINT-8052: Initial support for new EEP capRider Linden
2018-01-16MAINT-8052: Report if the returned environment is the default.Rider Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-07-01Merge from viewer-relese and become version 3.8.1andreykproductengine
2015-01-21MAINT-1722 FIXED Massive slowdown when opening "Place Profile" or "About ↵andreykproductengine
Land" dialog
2014-10-10fixing merge againdolphin
2014-05-22Fixed mergedolphin
2014-05-20Merge with 3.7.8-releasedolphin
2014-05-16ACME-1459: Experience tab added to the about land tab for editing parcel ↵dolphin
Experiences
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2013-11-27MAINT-3496 FIXED Disable "Allow group access" option if "Sell passes to: ↵Mnikolenko ProductEngine
group" is selected(and vice versa).
2013-11-27MAINT-3496 FIXED Disable "Allow group access" option if "Sell passes to: ↵Mnikolenko ProductEngine
group" is selected(and vice versa).
2013-06-05merge with viewer-releaseRichard Linden
2013-05-10SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect standard naming conventions for handlers vs. reactors
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2011-11-11EXP-1544 FIX Remove 'Edit Terrain' from About Land floatercallum
2011-07-07Revert code fo ER-1016 - "Remove ability for anyone to edit terrain"simon@lindenlab.com
and muck with the "About Land" Options tab one more time.
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-05-13Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-05-05Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated ↵brad kittenbrink
a bunch of unnecesary header dependencies.
2011-05-02ER-858: Add viewer checkbox to toggle parcel privacy settings. Reviewed by ↵Dave SIMmONs
Kelly
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-30converted static callbacks to member functions and deprecated ↵Richard Nelson
LLPanel::child*() methods
2010-05-25LLFloaterAvatarPicker now uses LLAvatarNamesLeyla Farazha
reviewed by James
2010-04-06Fixed normal bug EXT-6464 (Buy pass from popup menu doesn't work).Andrew Dyukov
- The bug was caused by deselection of parcel(because of zero ref count to parcel selection) after appearance of alert with ok/cancel. Added setting pointer to this selection before notification appearance and nullifying pointer it after user chooses ok or cancel. Nullifying will always take place because alert is modal, so there is no chance that LLPanelLandGeneral::cbBuyPass() won't be called. Reviewed by Mike at https://codereview.productengine.com/secondlife/r/180/ --HG-- branch : product-engine
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-01-11EXT-3629 About Land > Covenant contains incorrect informationLeyla Farazha
reviewed by Richard
2009-12-28implemented minor task EXT-3454 Code improvements: Replace old-style calback ↵Denis Serdjuk
with boost::function in the LLFloaterAvatarPicker --HG-- branch : product-engine
2009-12-19Added a first view script limits floatergabriel
reviewed by Mani
2009-11-03DEV-39999: Removed all legacy help buttons and notifications from theLynx Linden
code. All help should now go through the new help server, via the Help Browser floater. There should no longer be any custom "?" buttons in the UI - all <button> and <notification> XUI references relating to custom help buttons have been expunged. (I previously extracted all of the help strings from notifications.xml and passed these to the doc team to include in the help server pages.) I have checked that none of the XUI elements that are removed here are still referenced by any C++ code. I've also confirmed that there are no new notifications removed that I have not already passed on to the doc team. And I've also done a pass through the UI to make sure that all of the floaters still look as they should. Finally, I've confirmed that the new help system for floaters and side panels still works. 2,276 lines deleted - 0 lines added.
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-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-04svn merge -r 128442:129343 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 16:36:02 +0000