summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregioninfo.cpp
AgeCommit message (Collapse)Author
2022-10-24Merge master into DRTVWR-568 (and fix conflicts)Callum Linden
2022-09-15Merge branch 'master' into DRTVWR-568Callum Linden
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-08-26DRTVWR-568: Eliminate more blockers to C++17 language standard.Nat Goodspeed
2022-06-29Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llviewercontrol.cpp
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-05-12Merged DRTVWR-544-maint into SL-12238Howard Stearns
2022-05-11SL-12238 - error message to match new limitsHoward Stearns
2022-05-11SL-12238 - bump terrain texture size limit to 1024Howard Stearns
2022-03-30SL-16668 Enable/disable appropriate menu items in context menuMnikolenko Productengine
2022-02-02SL-11011 Multiselect, scroll to selection and search fix for estate's ban listAndrey Kleshchev
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-11-19Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llagentwearables.cpp # indra/newview/llvoicevivox.cpp
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-09-28Revert "Merge branch 'c++17' into DRTVWR-522-maint"Andrey Lihatskiy
This reverts commit 203ea3a70a775a09cbbffb1740ab7c58f1780baa, reversing changes made to 8e3f0778863a5aa337d1148a243ea91d238a8ac5. # Conflicts: # indra/newview/llmachineid.cpp
2021-09-03Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mixAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp
2021-07-20SL-15571 update ‘Reset’ button in the ‘Covenant’ tab correctlyMnikolenko Productengine
2021-05-07SL-15241: Tweak viewer sources to permit compiling on Mac with C++17.Nat Goodspeed
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-01-12SL-13313 Support RegionInfo5 block in RegionInfo message, and add log messageMnikolenko Productengine
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake ↵Callum Prentice
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-05-06DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72Nat Goodspeed
2020-03-25DRTVWR-476: Eliminate std::mem_fun1() special case for Windows.Nat Goodspeed
We used to have to use #if LL_WINDOWS logic to pass std::mem_fun1() to llbind2nd() instead of std::mem_fun() elsewhere. VS 2017 no longer supports std::mem_fun1(), which means we can eliminate the special case for Windows.
2019-10-07SL-12024 Remove 'Estate warning' message and show just region name insteadmaxim_productengine
2019-09-27SL-12024 [EEP] UI should indicate that the Environment tab is an estate-wide ↵maxim_productengine
setting.
2019-08-02SL-11668 Changes caused by Arrow Keys were not commitedandreykproductengine
2019-04-18Fix merge error from 6.2.1 EAM merge.Graham Linden
2019-04-17Merge 6.2.1Graham Linden
2019-04-04SL-10849: Select the correct notification for unchecking the parcel owners ↵Rider Linden
may override button.
2019-02-07SL-1036 Update estate access lists on the agent's access level changeAndreyL ProductEngine
2019-01-18SL-1942 Fixed the estate list change Confirmation messages to show agent ↵AndreyL ProductEngine
names properly
2019-01-16SL-10370 FIXED [EEP] 'Estate' tab is displayed with empty settings after ↵maxim_productengine
opening 'Region/Estate' floater for the second time
2019-01-07SL-9883: Hide controls and display message if parcel < 128mRider Linden
2019-01-04Move some estate requests into the LLEstateInfoModel and out of the Region ↵Rider Linden
floater. Fix issue where user could potentially be looking at one set of estate options and update the estate they were standing in by mistake.
2019-01-02SL-10279: Most functionality now present. Still needs some cleanup on the ↵Rider Linden
bump code.
2018-12-21SL-10279: Rework the environment pannel. Still in progress.Rider Linden
2018-12-07SL-10091 Prevent info floater from re-requesting data when not openandreykproductengine
2018-12-05SL-10091 EEP Filter out dupplicate refreshes and callbacksandreykproductengine
2018-11-12SL-9620 Viewer crashes after clicking "Commit" button while editing Day ↵andreykproductengine
Cycle preset
2018-10-08SL-9817 FIXED [EEP] Switching by Region/Estate tabs reset Day Cycle settingsmaxim_productengine
2018-09-27Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2018-09-19SL-9679 EEP - disable panel elements until data update, null cycle crash fixandreykproductengine
2018-09-17SL-9667, SL-9669: Do not attempt to request environment for non-eep parcels, ↵Rider Linden
use handle to panel passed to static for callbacks.
2018-09-14SL-1556: Correctly identify when the selected parcel is in another region ↵Rider Linden
and display a message about cross region environments.
2018-09-10MAINT-9099 Adjustable region altitudes.andreykproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 08:36:51 +0000