0ecfbc3de9
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# 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/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# 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/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
2024-05-16 14:10:55 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
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
314639426d
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llchat.h
# indra/llui/llcombobox.cpp
# indra/llui/llcontainerview.h
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderview.cpp
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmultifloater.cpp
# indra/llui/llmultifloater.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/llui/llspinctrl.cpp
# indra/llui/llspinctrl.h
# indra/llui/lltabcontainer.cpp
# indra/llui/lltabcontainer.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llui/llview.h
# indra/llui/llviewereventrecorder.cpp
# indra/llxml/llcontrol.cpp
# indra/llxml/llcontrol.h
# indra/newview/llagentlanguage.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llchicletbar.cpp
# indra/newview/llfloaterbuildoptions.cpp
# indra/newview/llfloaterbuildoptions.h
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llfloaterconversationpreview.h
# indra/newview/llfloaterdestinations.h
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterjoystick.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llfloaterpay.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterscriptdebug.cpp
# indra/newview/llfloaterscriptdebug.h
# indra/newview/llfloaterscriptedprefs.cpp
# indra/newview/llfloatersearch.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatertools.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llmediactrl.h
# indra/newview/llmoveview.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/llnotificationlistitem.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroupnotices.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelobject.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llpanelpermissions.h
# indra/newview/llpanelprofileclassifieds.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelsnapshot.h
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotlocal.cpp
# indra/newview/llpanelsnapshotpostcard.cpp
# indra/newview/llpreviewnotecard.h
# indra/newview/llstartup.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/llstatusbar.h
# indra/newview/llsyswellwindow.h
# indra/newview/lltexturectrl.h
# indra/newview/lltoolbarview.cpp
# indra/newview/lltoolselect.cpp
# indra/newview/llwearableitemslist.cpp
2024-02-21 13:07:42 +01:00
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
8c16ec2b53
Convert BOOL to bool in LLControlGroup and related classes
2024-02-21 03:00:25 +02:00
4532e17e3d
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llpanelface.cpp
2023-09-20 15:07:19 +02:00
2e7cf2c1af
SL-20268 FIXED clicking Cancel doesn't revert Materials perms
2023-09-14 14:55:41 +03:00
52ce4adb0c
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-10-19 11:40:51 +02:00
3d170fae5d
SL-18125 Separate GLTF permissions from normal uploads
2022-10-13 21:02:02 +03:00
6afd505fa8
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-05 15:24:10 +02:00
ec9b989863
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-05 00:37:16 +03:00
08b75b5ee7
SL-12733 FIXED Default Creation Permissions for Objects is ignored after a relog
2020-02-24 17:26:16 +02:00
99667af710
Merge viewer-eep
2018-09-22 01:38:32 +02:00
6c9e4e3cf0
SL-9715 [EEP] Allow setting default creation permissions for environment settings
2018-09-21 14:38:32 +03:00
8c79214f0b
MAINT-6970 FIXED Crash in LLFloaterPermsDefault::updateCap()
2016-11-30 15:03:22 +02:00
caa0e333ed
MAINT-6970 FIXED Crash in LLFloaterPermsDefault::updateCap()
2016-11-30 15:03:22 +02:00
2797c5938a
Merge Firestorm LGPL
2016-04-05 10:47:23 +02:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c20277f2f5
Merge.
2015-12-21 20:52:46 +01:00
2763bbd975
Initial changes for Vivox/Azumarill merge. Lots of temporary code and conditional compile switches. Begin switch from statemachine to coroutine.
2015-12-04 14:27:22 -08:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
c218e524b2
Merge - Step 1; Still enough to do.
2015-10-26 20:20:13 +01:00
53b947e039
Merge from viewer release.
2015-10-19 12:03:08 -07:00
fd4da22ed6
BUG-10466: Default creation permissions changes for objects don't work until you relog; Also set cap sent = true only on success so we automatically retry on region change
2015-10-13 09:28:11 +02:00
75c6549fde
Set consistent terminology for yield/wait -> suspend for coroutines.
2015-09-18 11:39:22 -07:00
5fe09cb64d
Merge Viewer-Bear
2015-08-22 03:13:17 +02:00
efa9a0f99c
Backed out changeset bab1000e1b2d: restore 'selfless' changes
2015-07-10 19:30:10 -04:00
247eb0c9c3
Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5
2015-07-07 19:41:27 +01:00
b262ded7e0
MAINT-5351: Remove 'self' parameter from coroutine functions.
...
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest
builds clean, but the resulting viewer is as yet untested.
2015-07-01 18:33:29 -04:00
d201f49ce3
MAINT-5137 FIXED Warning sometimes appears at login - Alert: There was a problem
...
Added logic to resend HTTP request for default perms saving
2015-06-04 20:03:20 +03:00
e9257f034a
Object default perm floater
2015-05-22 15:33:40 -07:00
6324e58000
improve logging of errors in default permissions cap
2015-04-02 21:11:22 -04:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
c7c549b7e2
LLFloaterPermsResponder switched to new Responder API
2014-11-26 11:39:16 -05:00
8b37bc06e4
FIRE-15869: Introduce some retry functionality for sending default perms and not bug the user if it fails the first time
2015-04-15 23:40:01 +02:00
d06a0217d9
Merge LL 3.7.26
2015-03-23 12:29:56 -07:00
95c33139b9
Update new default perms floater to use new cURL API
2015-01-12 15:03:51 +01:00
e7d6a03530
Adjust new default perms for OpenSim:
...
* Only use our old new object perms method if we are not in SL or using caps resulted in an error
* Removed new object perms settings from Firestorm preferences panel as they are now set via the new default perms floater
2015-01-12 13:40:25 +01:00
a4173dc81a
STORM-68 Remove obsolete note. Refactor a few blocks of code to not have early returns
2014-01-08 09:30:30 -05:00
c804c6b69e
STORM-68 Remove Apply button
...
Add menu entry to Build->Options->Set Default Permissions...
Disable Preferences->Advanced->Default Creation Permissions button when on login screen
Add code for a one-time conversion from the old upload settings
XML cleanup
2013-12-12 14:11:28 -05:00
2d701456a0
STORM-68 Fix bug for new gestures, notecards, and scripts where a copied item did not preserve its default permissions.
...
Add apply button.
2013-12-12 08:51:15 -05:00
096530b726
STORM-68 Get display error message once to work properly
2013-12-05 14:42:14 -05:00
944840c8b1
STORM-68 Code cleanup/function renaming
2013-12-05 13:26:43 -05:00
9e8a7869ce
STORM-68 Change CAP name to AgentPreferences and adjust LLSD format to mesh with server changes
2013-12-03 10:44:44 -05:00
176901422f
STORM-68 Reapply changes to inventory processing lost in the merge.
...
Move call to updateCap back to where it was. The place it was moved
to was too early in the login sequence and was causing a crash.
2013-11-20 10:21:41 -05:00
0031e9a97b
merge up to 3.6.10-release; some of the storm-68 changes lost
2013-11-19 17:59:55 -05:00
b7edc965bc
STORM-68 Place initial call to send cap in new, better location.
...
Make processing of debug setting names a little more elegant.
2013-11-19 16:32:41 -05:00
56b1b35a18
STORM-68 Send default permissions to simulator just once after logging in
2013-11-11 13:21:12 -05:00
Ansariel