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 |
|
Kitty Barnett
|
01bb57adff
|
[FIXED] @setenv_XXX commands affect the local rather than edit environment when @setenv restricted and @setenv_daycycle was issued
|
2020-11-21 23:38:45 +01:00 |
|
Kitty Barnett
|
43bd5d8303
|
[FIXED] Holding the @setenv restriction isn't preventing other objects from changing the environment settings
|
2020-11-21 23:11:55 +01:00 |
|
Kitty Barnett
|
c326edb942
|
[FIXED] @setenv_XXX commands are non-functional during environment transitions
|
2020-11-21 18:45:51 +01:00 |
|
Kitty Barnett
|
b499f6981b
|
[FIXED] FIRE-30508: @setenv_XXX commands are non-functional when the shared environment is the currently selected environment
|
2020-11-21 15:01:10 +01:00 |
|
Kitty Barnett
|
1852cadb11
|
Merge branch 'rlva/feature/eep' into rlva/development
|
2020-07-26 21:55:16 +02:00 |
|
Kitty Barnett
|
471c53e870
|
[FIXED] Crash on Linux when issuing @setenv_ambientr:<value>=force (legacy handling functions returned a reference to a local variable)
|
2020-07-15 23:51:57 +02:00 |
|
Kitty Barnett
|
4103483b91
|
Fix incorrect bounds check
|
2020-06-20 18:17:29 +02:00 |
|
Kitty Barnett
|
401de9da95
|
[FIXED] Remove unused lambda capture since GCC/Clang is getting upset about it
|
2020-06-16 15:15:48 +02:00 |
|
Kitty Barnett
|
1d4b173ee4
|
[FIXED] Re-add missing legacy @[get|set]env_<color>i commands
|
2020-05-02 23:06:55 +02:00 |
|
Kitty Barnett
|
a7e5b8ecc9
|
Restore the @setenv restriction
|
2020-04-27 00:07:19 +02:00 |
|
Kitty Barnett
|
fbd23878fc
|
Rewrite all @setenv related commands against the new atmospherics/environment class
|
2020-04-19 14:12:00 +01:00 |