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
|
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 |
|
Nicky
|
b903da2f15
|
Make code slightly more optimal (clang warning).
|
2021-06-23 20:50:11 +02:00 |
|
Ansariel
|
594b174a3c
|
Sligtly optimize this...
|
2020-10-24 16:40:02 +02:00 |
|
Ansariel
|
29f8de325c
|
Clean this up a bit
|
2020-04-16 10:34:52 +02:00 |
|
Ansariel
|
084eb8c030
|
This is of course not the same...
|
2020-04-16 08:48:36 +02:00 |
|
Ansariel
|
b93a63a029
|
Use some LL definitions
|
2020-04-15 21:01:32 +02:00 |
|
Ansariel
|
852eae68b3
|
FIRE-29021: Replace broken "Stop" region crossing behavior with improved version by animats
|
2020-04-12 00:28:16 +02:00 |