Ansariel
|
088cc2ea35
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
|
2024-07-09 02:25:42 +02:00 |
|
Ansariel
|
9fdca96f8b
|
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
|
2024-07-08 20:27:14 +02:00 |
|
Ansariel
|
684bc1d1ea
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/llcommon/llsys.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/logcontrol.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llspeakers.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvocache.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
|
2024-06-21 19:46:51 +02:00 |
|
Ansariel
|
7342ebf43a
|
Follow-up improvements of 810219d3bf
|
2024-06-18 21:41:00 +03:00 |
|
Andrey Kleshchev
|
810219d3bf
|
jira-archive-internal#67837 Fix LLDir::getScrubbedFileName
|
2024-06-18 21:00:08 +03:00 |
|
Ansariel
|
a17fd2352a
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
|
2024-06-09 16:11:24 +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
|
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 |
|
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
|
799c2c6dab
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/newview/llinventorygallery.cpp
# indra/newview/skins/default/xui/de/menu_viewer.xml
|
2024-03-02 00:42:18 +01:00 |
|
Ansariel
|
45dc1a63f0
|
Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llprimitive/lldaeloader.cpp
# indra/llui/lllayoutstack.cpp
# indra/llui/llnotifications.h
# indra/llui/lltoolbar.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterimcontainer.cpp
# indra/newview/llfloaterimnearbychathandler.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llsidepanelappearance.h
# indra/newview/lltoolbarview.cpp
|
2024-01-12 14:18:34 +01:00 |
|
Ansariel
|
ba74152c82
|
Replace BOOST_FOREACH with standard C++ range-based for-loops
|
2024-01-09 20:44:50 +02:00 |
|
Ansariel
|
bea3e75d70
|
Don't inject files into the source tree
|
2023-04-22 14:27:00 +02:00 |
|
Beq
|
c97777d106
|
don't warn when LL_PATH_NONE was deliberately selected
|
2022-02-12 20:26:22 +00:00 |
|
Andrey Lihatskiy
|
0bffd3d365
|
Merge branch 'master' into DRTVWR-519
# Conflicts:
# README.md
|
2021-11-16 01:21:05 +02:00 |
|
Ansariel
|
7a845ee23b
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-522
|
2021-09-20 12:59:14 +02:00 |
|
Ansariel
|
f8d1834036
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-06-09 08:48:27 +02:00 |
|
Ansariel
|
826ee26272
|
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-06-08 19:55:43 +02:00 |
|
Callum Prentice
|
ad9ed0a94d
|
Merge with tip of Master after Viewer release
|
2021-06-07 18:55:00 -07:00 |
|
Callum Prentice
|
168d177197
|
This set of changes reverts the merge with master (git revert c83e740) and 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-09 14:39:51 -08:00 |
|
Brad Payne (Vir Linden)
|
c83e740ef9
|
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
|
2021-03-08 13:56:16 +00:00 |
|
Ansariel
|
3804ec1d03
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-03-04 08:35:13 +01:00 |
|
Ansariel
|
2ff2a32cfc
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-03-03 23:40:00 +01:00 |
|
Ansariel
|
6b6b116fd4
|
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
|
2021-03-03 00:20:02 +01:00 |
|
Callum Prentice
|
d9448c6f52
|
The folder where the disk cache lives was originally renamed from llvfs to llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
|
2020-09-17 09:45:06 -07:00 |