Commit Graph

96 Commits (c203bb650adb30e47efe2f6290748a92cafc0f4e)

Author SHA1 Message Date
Ansariel f0e4dcdaf6 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llthread.h
#	indra/llmessage/llcachename.cpp
#	indra/llui/lllineeditor.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llchatitemscontainerctrl.cpp
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llimprocessing.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llnotificationhandlerutil.cpp
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexture.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoavatar.cpp
2024-05-08 05:10:22 +02:00
Alexander Gavriliuk f9473e8afc secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries 2024-05-07 10:18:51 +02:00
Ansariel 4a5b1c1bc5 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/JsonCpp.cmake
#	indra/cmake/LLAddBuildTest.cmake
#	indra/llcommon/lluuid.cpp
#	indra/llcorehttp/CMakeLists.txt
#	indra/llmessage/CMakeLists.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llpanelprofilepicks.cpp
#	indra/newview/llpreviewscript.cpp
#	indra/newview/llpreviewscript.h
#	indra/newview/llscripteditor.h
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/llvoavatar.cpp
#	indra/test/CMakeLists.txt
#	indra/test/test.cpp
2024-04-12 03:28:00 +02:00
Ansariel d0102af56d Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
#	indra/llcommon/llapp.cpp
#	indra/llcommon/llapp.h
#	indra/llimage/llimageworker.cpp
#	indra/llui/llcontainerview.cpp
#	indra/llui/llcontainerview.h
#	indra/llui/llkeywords.cpp
#	indra/llui/lltabcontainer.cpp
#	indra/llui/lltextbase.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfavoritesbar.h
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llhudnametag.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llpanelprofilepicks.cpp
#	indra/newview/llpanelvoicedevicesettings.h
#	indra/newview/llpreviewscript.cpp
#	indra/newview/llpreviewscript.h
#	indra/newview/llselectmgr.cpp
#	indra/newview/lltranslate.cpp
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llviewermessage.cpp
2024-04-11 21:59:38 +02:00
Ansariel 85ae4ed95b Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llxml/llcontrol.cpp
#	indra/llxml/llxmlnode.cpp
#	indra/llxml/llxmltree.h
#	indra/newview/CMakeLists.txt
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llfloaterauction.cpp
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
2024-03-08 16:56:01 +01:00
Alexander Gavriliuk a865d42397 viewer#819 Avoid reading the same XML file multiple times 2024-03-05 19:54:31 +01:00
Ansariel 7bcb96b2f9 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	.github/ISSUE_TEMPLATE/10-bug.yaml
#	.github/ISSUE_TEMPLATE/20-enhancement.md
#	.github/ISSUE_TEMPLATE/config.yml
#	indra/newview/app_settings/settings.xml
#	indra/newview/llagent.cpp
#	indra/newview/llfloaterpreference.h
#	indra/newview/llpanelpeople.cpp
#	indra/newview/llpanelpeople.h
#	indra/newview/llviewermenu.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/skins/default/xui/en/panel_performance_nearby.xml
#	indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2024-03-05 11:55:43 +01:00
Ansariel e160758b5c Convert remaining TRUE/FALSE to true/false 2024-03-01 15:33:16 +02:00
Ansariel b71c7f37ea Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llagent.cpp
#	indra/newview/llagent.h
#	indra/newview/llagentcamera.cpp
#	indra/newview/llagentcamera.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llattachmentsmgr.cpp
#	indra/newview/llattachmentsmgr.h
#	indra/newview/llavataractions.cpp
#	indra/newview/llcallingcard.cpp
#	indra/newview/llcompilequeue.cpp
#	indra/newview/llcontrolavatar.h
#	indra/newview/lldirpicker.cpp
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolalpha.h
#	indra/newview/lldrawpoolavatar.h
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfasttimerview.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llfloateravatarpicker.cpp
#	indra/newview/llfloaterbeacons.cpp
#	indra/newview/llfloaterbvhpreview.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloaterchangeitemthumbnail.cpp
#	indra/newview/llfloaterdisplayname.cpp
#	indra/newview/llfloatergotoline.cpp
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloaterland.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
#	indra/newview/llfloaterscriptdebug.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersnapshot.cpp
#	indra/newview/llfloatertools.cpp
#	indra/newview/llfloatertools.h
#	indra/newview/llfloateruipreview.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgiveinventory.cpp
#	indra/newview/llglsandbox.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llhudeffectlookat.cpp
#	indra/newview/llhudeffectlookat.h
#	indra/newview/llhudicon.cpp
#	indra/newview/llhudmanager.cpp
#	indra/newview/llhudtext.cpp
#	indra/newview/llhudtext.h
#	indra/newview/llimprocessing.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventorymodel.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/lllocalbitmaps.cpp
#	indra/newview/lllogininstance.cpp
#	indra/newview/llmaniptranslate.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llmodelpreview.h
#	indra/newview/llmutelist.cpp
#	indra/newview/llnavigationbar.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llnetmap.cpp
#	indra/newview/llnetmap.h
#	indra/newview/llnotificationlistitem.cpp
#	indra/newview/lloutputmonitorctrl.cpp
#	indra/newview/llpanelcontents.cpp
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llpanelexperiencepicker.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelgroup.cpp
#	indra/newview/llpanelgroupnotices.cpp
#	indra/newview/llpanelgrouproles.cpp
#	indra/newview/llpanellandaudio.cpp
#	indra/newview/llpanellandmarks.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelobject.cpp
#	indra/newview/llpanelobject.h
#	indra/newview/llpanelpeople.cpp
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llpanelplaces.cpp
#	indra/newview/llpanelpresetspulldown.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofilepicks.cpp
#	indra/newview/llpanelsnapshot.h
#	indra/newview/llpanelvolume.cpp
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llpreviewanim.cpp
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llpreviewnotecard.cpp
#	indra/newview/llpreviewscript.cpp
#	indra/newview/llpreviewscript.h
#	indra/newview/llpreviewtexture.cpp
#	indra/newview/llpreviewtexture.h
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llsnapshotlivepreview.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llstatusbar.cpp
#	indra/newview/llsurface.h
#	indra/newview/llsurfacepatch.cpp
#	indra/newview/lltexturecache.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturefetch.cpp
#	indra/newview/lltoastimpanel.cpp
#	indra/newview/lltoolbarview.cpp
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/lltoolface.cpp
#	indra/newview/lltoolfocus.cpp
#	indra/newview/lltoolgrab.cpp
#	indra/newview/lltoolgun.cpp
#	indra/newview/lltoolgun.h
#	indra/newview/lltoolpie.cpp
#	indra/newview/lltoolplacer.cpp
#	indra/newview/lltoolselect.cpp
#	indra/newview/lluploaddialog.cpp
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llvieweraudio.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerfoldertype.cpp
#	indra/newview/llviewerinput.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewermenu.h
#	indra/newview/llviewermenufile.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewerobjectlist.h
#	indra/newview/llviewerparcelmgr.cpp
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerregion.h
#	indra/newview/llviewershadermgr.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexlayer.h
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexture.h
#	indra/newview/llviewertexturelist.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llviewerwindow.h
#	indra/newview/llvoavatar.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvoavatarself.cpp
#	indra/newview/llvoavatarself.h
#	indra/newview/llvoiceclient.h
#	indra/newview/llvosky.cpp
#	indra/newview/llvosurfacepatch.cpp
#	indra/newview/llvotree.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvovolume.h
#	indra/newview/llvowater.cpp
#	indra/newview/llworld.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/llworldmipmap.cpp
#	indra/newview/pipeline.cpp
2024-02-22 11:43:04 +01:00
Ansariel 3ffe63b8a4 Convert remaining BOOLs in llxml and introduce std::string_view 2024-02-21 19:02:58 +02:00
Ansariel 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
Ansariel 8c16ec2b53 Convert BOOL to bool in LLControlGroup and related classes 2024-02-21 03:00:25 +02:00
Ansariel 9dc3651d0c Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llappearance/lltexlayer.cpp
#	indra/llappearance/lltexlayer.h
#	indra/llappearance/lltexlayerparams.cpp
#	indra/llappearance/llwearabletype.cpp
#	indra/llcharacter/llbvhloader.cpp
#	indra/llcharacter/llbvhloader.h
#	indra/llcharacter/llcharacter.cpp
#	indra/llcharacter/llcharacter.h
#	indra/llcharacter/lljoint.h
#	indra/llcharacter/llvisualparam.cpp
#	indra/llfilesystem/lldir_win32.cpp
#	indra/llfilesystem/lldir_win32.h
#	indra/llinventory/llparcel.cpp
#	indra/llmath/llmath.h
#	indra/llmath/llvolume.cpp
#	indra/llmessage/lldatapacker.h
#	indra/llxml/llxmltree.h
#	indra/newview/CMakeLists.txt
#	indra/newview/llagentwearables.cpp
#	indra/newview/llagentwearables.h
#	indra/newview/lldirpicker.cpp
#	indra/newview/llphysicsmotion.cpp
#	indra/newview/llviewergesture.cpp
#	indra/newview/llviewerjointattachment.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexlayer.h
#	indra/newview/llvoavatarself.cpp
#	indra/newview/llvoavatarself.h
2024-02-18 00:09:57 +01:00
Lars Næsbye Christensen 9e854b697a misc: BOOL to bool 2024-02-17 12:23:07 +02:00
Ansariel 9a044f4a52 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llappearance/llavatarappearance.cpp
#	indra/llappearance/llavatarappearance.h
#	indra/llappearance/lldriverparam.h
#	indra/llappearance/llviewervisualparam.cpp
#	indra/llaudio/llaudiodecodemgr.cpp
#	indra/llcharacter/llcharacter.cpp
#	indra/llfilesystem/llfilesystem.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llpanelnearbymedia.cpp
#	indra/newview/llpanelnearbymedia.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llvoavatar.h
#	indra/newview/llvovolume.cpp
#	indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
2024-02-13 00:54:24 +01:00
Lars Næsbye Christensen 70f8dc7a4f miscellaneous: BOOL (int) to real bool 2024-02-12 23:17:22 +02:00
Lars Næsbye Christensen 2b31dad400 miscellaneous: BOOL (int) to real bool 2024-02-12 23:17:22 +02:00
Ansariel 682535dd16 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/cmake/00-Common.cmake
#	indra/llcommon/stdtypes.h
2023-07-19 10:27:16 +02:00
Nat Goodspeed 230c96b20d SL-18330: Remove some set-but-unused vars flagged by Xcode 14.3. 2023-04-03 13:53:18 -04:00
Ansariel 817532155b Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-29 09:37:14 +02:00
Brad Payne (Vir Linden) d556a8a974 SL-13834 - omit string-type controls from preference logs 2020-08-31 20:51:40 +01:00
Brad Payne (Vir Linden) 9cc0510b4e SL-13834 - add preferences info to ViewerStats, only when exiting and different from default 2020-08-26 16:06:29 +01:00
Ansariel 8abb2cd6b3 Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersavecamerapreset.cpp
#	indra/newview/llpanelvolumepulldown.cpp
#	indra/newview/llpanelvolumepulldown.h
#	indra/newview/llpresetsmanager.cpp
#	indra/newview/skins/default/xui/en/floater_camera.xml
2020-04-23 19:21:00 +02:00
Mnikolenko Productengine 74d6e6b65c SL-12904 FIXED Camera Preset does not restore correctly when sitting 2020-04-20 14:27:22 +03:00
Ansariel 0e36db79e1 Merge viewer-neko 2018-12-01 16:34:33 +01:00
andreykproductengine baeca41027 SL-10089 Logs to see which gSavedSettings.get calls should be cached 2018-11-19 20:20:34 +02:00
Ansariel 09e3cab862 Add suggestion what to do in case of "Must supply a comment for control x" error to error message 2017-12-12 20:07:12 +01:00
Ansariel 1ca7437292 Transplant settings improvements to sanity check types 2016-03-31 21:52:47 +02:00
Ansariel 14954d999d Merge viewer-quickgraphics 2016-03-31 18:54:45 +02:00
Oz Linden 518f92126f improve settings error log, and make type conversion methods static 2016-03-23 11:50:39 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel d9dc061224 Fix fake booleans 2015-08-04 09:59:42 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Ansariel e00cc1c9ce Add LessThanEquals and GreaterThanEquals sanity type checks and remove kludges in settings.xml 2015-05-01 21:58:23 +02:00
Oz Linden 5c6cf3e7fb restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes 2015-04-10 11:02:37 -04:00
Oz Linden 8b42c7898e replace llifstream and llofstream with std::ifstream and std::ofstream respectively 2015-04-07 17:59:28 -04:00
Oz Linden 3a57b18896 convert llifstream and llofstream to std::ifstream and std::ofstream respectively 2015-04-07 17:28:05 -04:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Oz Linden 3364614f8b add "Settings" logging tag to make debugging settings loading easier 2013-08-29 09:27:12 -04:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Nat Goodspeed d2386652f8 CHOP-962: Make LLControlVariable::setPersist() accept only enum.
Initial change made LLControlVariable::mPersist an enum, but retained
bool/BOOL public API. setPersist(true) set one value, setPersist(false) set
another, forcePersist() set the third. Per code review, expose enum to public,
make setPersist() (and LLControlVariable constructor, and LLControlGroup::
declareControl(), and all the LLControlGroup::declareMumble() methods, and all
the unit-test dummy declareMumble() method bodies) accept that enum. Remove
forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly.
Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-07-25 16:46:51 -04:00
Nat Goodspeed 35bc91fc5d CHOP-962: Emit unrecognized-var log message only for Global settings.
LLControlGroup::loadFromFile() can of course detect which LLControlGroup
instance it's loading. We only want to log unrecognized settings variables in
LLControlGroup "Global". Settings for "Don't show me this again" notifications
are in group "Warnings".
2013-07-22 22:06:48 -04:00
Nat Goodspeed fd14c250b8 CHOP-962: Preserve unrecognized user settings variables.
Change LLControlVariable::mPersist from bool to tri-state enum. Its 'true'
value used to mean "persist only if changed from default;" third state now
means "persist regardless of value." Add forcePersist() method to set that.
Replace isSaveValueDefault() method -- used only by logic to determine whether
to save the variable -- with shouldSave() method to encapsulate ALL that logic
rather than only part of it. shouldSave() recognizes PERSIST_ALWAYS state.
When loading an unrecognized control variable from a user settings file, use
forcePersist() to ensure that we later save that variable again.
Tweak one of the unit tests to adjust for new semantics.
2013-07-17 11:30:09 -04:00
Nat Goodspeed 2b3c1bd40d CHOP-962: Make LLControlGroup::declare* return LLControlVariable*
LLControlGroup::declareControl(), declareString() etc. etc. all used to return
BOOL -- which no one ever examines because it unconditionally returned TRUE.
Make it return the (possibly new) LLControlVariable* instead.
2013-07-17 08:23:42 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Don Kjer 54cdc322b8 Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam. 2013-03-05 22:05:22 -08:00