Ansariel
|
62b11fc825
|
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/llinventory/llsettingssky.cpp
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/llappviewer.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/lltoolcomp.h
# indra/newview/lltoolfocus.h
# indra/newview/llviewerhelp.h
# indra/newview/llvoicevivox.h
|
2023-02-04 13:39:11 +01:00 |
|
Callum Prentice
|
3185bdea27
|
DRTVWR-489-emoji: As part of the work to get macOS version of the Viewer working, the flag was introduced to warn (and therefore error out) when a virtual override was not marked with the 'override' keyword. Fixing this up involved a large number of changes and this commit represents just those changes - nothing specially from the DRTVWR-489 viewer
|
2023-01-26 14:45:45 -08:00 |
|
Ansariel
|
0007ff2660
|
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-05-07 12:29:58 +02:00 |
|
Ansariel
|
46a78a33d1
|
Fix name of newly created setting is not translated - better solution to save some look-ups
|
2020-04-30 13:50:51 +02:00 |
|
Ansariel
|
bd1dc19062
|
Fix name of newly created setting is not translated
|
2020-04-30 13:44:05 +02:00 |
|
Mnikolenko Productengine
|
5d7dc08d71
|
SL-12298 Convert LLSettingsType to an LLSINGLETON variant
|
2020-04-28 17:47:53 +03:00 |
|
Rider Linden
|
d6ede8e81c
|
MAINT-8904: Creating new setting in inventory now causes simulator to assign default asset ID to inventory item.
|
2018-07-30 15:54:36 -07:00 |
|
Graham Linden graham@lindenlab.com
|
c11c17ed7b
|
Remove override keyword not working with LL_SINGLETON pattern.
|
2018-03-06 23:44:09 +00:00 |
|
Rider Linden
|
cbe4cac78c
|
Settings type inventory objects and upload the assests.
|
2018-03-06 14:58:39 -08:00 |