Commit Graph

206 Commits (6ebd8a9e82bb8df2df64845cd0adbab4e46152cd)

Author SHA1 Message Date
Mnikolenko Productengine dead3c1fca #3857 teleport finished/failed event 2025-04-03 15:11:51 +03:00
Andrey Kleshchev fa963b6b15 #3438 Crash when ParcelProperties' Bitmap is of wrong size 2025-01-20 22:37:28 +02:00
Ansariel b42f9d836b Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 1b67dd855c Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# 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-05-22 19:04:52 +02:00
Alexander Gavriliuk f9473e8afc secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries 2024-05-07 10:18:51 +02:00
Andrey Lihatskiy 38c2a5bde9 Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge 2024-05-01 08:16:58 +03:00
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Ansariel 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
Lars Næsbye Christensen 9e854b697a misc: BOOL to bool 2024-02-17 12:23:07 +02:00
Andrey Kleshchev b7ad7ccaaa SL-20506 Crash when recreating LLViewerParcelMedia 2023-10-20 01:08:56 +03:00
Andrey Kleshchev 1f94ac9b89 SL-19549 Add option to show ban lines on collision #2 2023-04-18 15:53:13 +03:00
Andrey Kleshchev eaccee37f2 SL-19549 Add option to show ban lines on collision 2023-04-17 13:33:49 +03:00
Andrey Lihatskiy 97b676b60f Merge branch 'master' into DRTVWR-565-maint-P 2022-10-20 21:43:54 +03:00
Andrey Lihatskiy 329268c5f7 Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
#	indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Andrey Kleshchev fca85429c5 SL-17753 Crash at LLStatusBar::getNearbyMediaPanel
optionallyStartMusic was called before status bar was initialized
2022-07-12 00:07:43 +03:00
Mnikolenko Productengine 662cc980fc SL-17643 FIXED noninteractive viewer crashes on locations with parcel audio 2022-06-23 13:35:29 +03:00
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
Andrey Lihatskiy 91606c7b60 Merge branch 'master' into DRTVWR-548-maint-N 2022-05-26 03:07:05 +03:00
Mnikolenko Productengine 1af45ee1df SL-16921 FIXED Viewer crashes on disconnect if 'About land' floater is opened 2022-02-24 13:04:09 +02:00
Cosmic Linden 898079a39b SL-16857: Display parcel borders on the minimap, enable by default, right click context menu option to disable 2022-02-23 17:14:38 -08:00
Mnikolenko Productengine 2112abac1b SL-16297 Support the parcel obscure_moap flag. 2021-12-17 18:13:20 +02:00
Andrey Lihatskiy 7f19c512c9 Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
#	indra/newview/app_settings/settings.xml
2021-06-25 00:54:35 +03:00
Andrey Kleshchev 2351809b5c SL-14796 Resolved encountered merge issue 2021-02-04 18:04:42 +02:00
Andrey Kleshchev 1b21cc8ffb SL-14372 Changes to parcel properties should not pause or ask about music unless url changed 2020-11-25 14:25:30 +02:00
Andrey Kleshchev f554fe2ca7 SL-10326 Allow selecting any movable avatars with 'Allow Select Avatar' option 2020-07-10 23:51:39 +03:00
Andrey Kleshchev a6b3b98e52 SL-12898 Added https to allowed audio links 2020-04-30 22:11:34 +03:00
Dave Houlton 2a6b48c9b0 DRTVWR-440, merge in latest from 6.3.7 release 2020-01-28 17:26:45 -07:00
Dave Houlton dc1453af9c Merge in from viewer-release 6.3.5 2019-11-13 16:46:27 -07:00
AndreyL ProductEngine 5f731d84cb Downstream merge from 494-maint-wassail 2019-11-12 02:37:15 +02:00
andreykproductengine e29b3605c3 SL-11315 Viewer asks to play media and retains selected choice 2019-09-05 17:15:57 +03:00
andreykproductengine 30cc3ff01f DRTVWR-493 LLViewerParcelMedia to singleton 2019-06-21 21:31:40 +03:00
Graham Linden 470d1595cc Merge viewer-release 2019-05-08 09:30:39 -07:00
Rider Linden 2401712d10 SL-9660: Next pass cleanup. Removed and downgraded a number of logs. Removed refs to LAPAS. Better sync with legacy regions. 2019-02-20 15:20:30 -08:00
andreykproductengine c7a7503b2c SL-10096 ParcelPropertiesRequest is sent too often when terraforming or hover tooltips are On 2018-11-27 18:51:53 +02:00
andreykproductengine 4f6037a823 SL-3404 Named log output for easier debugging and testing 2018-11-19 19:20:57 +02:00
andreykproductengine bda785e8b1 SL-10033 [EEP] Use fast environment transition for teleports 2018-11-12 20:11:00 +02:00
maxim_productengine aa43ddf674 SL-9808 [EEP] Don't update environment each time we receive parcel info after hovering any parcel 2018-10-05 16:48:49 +03:00
Rider Linden cae08e0096 SL-9661: Trigger an event when the settings on a parcel or region are changed. Environment panel montiors this event and updates itself when it occurs. 2018-09-19 15:31:23 -07:00
maxim_productengine d1f746ff7f SL-9656 FIXED EEP viewer crash after opening About Land and then right-clicking a Day Cycle in Inventory 2018-09-14 15:47:52 +03:00
andreykproductengine bb52cdf4f0 SL-1307 EEP At startup viewer does not recognize what parcel you are on. 2018-09-13 18:36:47 +03:00
Rider Linden b50d546d5f MAINT-7699: More robust cap protocol, better support for delete and support for individual tracks, support for setting environment by asset id in the cap
MAINT-7703: Initial flags sent in message protocol for parcels
2018-08-03 16:13:22 -07:00
Rider Linden 294793b9a9 MAINT-8821: Tighten up floater. Allow apply from gear menu. 2018-07-10 15:15:47 -07:00
Rider Linden 2f655d117a Request environment when parcel settings are changed. 2018-06-18 15:48:48 -07:00
Nat Goodspeed fe64db61d6 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-05-22 21:30:26 -04:00
Nat Goodspeed e2b56c9bba DRTVWR-418: Eliminate reference to LLParcelSelection::sNullSelection. 2017-03-30 16:13:26 -04:00
Rider Linden cee83074e9 Backed out changeset: 87661f6ec809 2017-03-13 14:47:28 -07:00
Rider Linden 988f624f01 MAINT-7196: Revers flag when sent to viewer (to correctly mask when value isn't sent) 2017-03-13 14:16:37 -07:00
Rider Linden 880be86cf2 MAINT-7196: Viewer changes supporting new Allow Access Override opition for estate owners. 2017-03-10 15:07:55 -08:00