Kitty Barnett
|
4f805d796a
|
Merge branch 'rlva/development' into rlva/development
|
2020-06-15 20:24:42 +02:00 |
|
Kitty Barnett
|
c1c3700ce7
|
[FIXED] Merge whoopsie
|
2020-06-15 20:21:55 +02:00 |
|
Kitty Barnett
|
8be31d980e
|
[FIXED] Prevent unchecking atmospheric shaders when @setenv restricted
|
2020-06-15 20:14:25 +02:00 |
|
Kitty Barnett
|
c204f194fb
|
Increment spec version to "RLVa - Trinity edition"
|
2020-06-15 19:45:01 +02:00 |
|
Kitty Barnett
|
fa07fe8d1c
|
Merge branch 'rlva/development' (v2.2.3) into rlva/development
|
2020-06-13 21:04:48 +02:00 |
|
Kitty Barnett
|
386943e007
|
Merge branch 'viewer/build' nto rlva/development
|
2020-06-13 20:59:05 +02:00 |
|
Kitty Barnett
|
c9646050ef
|
Incremented version to RLVa-2.2.3
|
2020-06-13 20:55:27 +02:00 |
|
Kitty Barnett
|
5be88df318
|
Add @setcam_eyeoffsetscale:<multiplier>=n and @setcam_eyeoffsetscale[:<multiplier>]=force
|
2020-06-13 00:01:49 +02:00 |
|
Kitty Barnett
|
9b58b4b7c8
|
@setcam_eyeoffset and @setcam_eyeoffsetscale fix-ups due to camera presets
|
2020-06-12 16:05:34 +02:00 |
|
Kitty Barnett
|
fd313a7061
|
Merge branch 'lindenlab/camera-presets' into rlva/development
|
2020-06-12 15:38:34 +02:00 |
|
Kitty Barnett
|
4f05d71e49
|
Merge branch 'rlva/development' into rlva/development
|
2020-06-11 17:49:32 +02:00 |
|
Kitty Barnett
|
b0e3bb9184
|
Merge branch 'viewer/build' into rlva/development
|
2020-06-11 17:48:32 +02:00 |
|
Kitty Barnett
|
1bee1e0eda
|
Merge branch 'rlva/bugfix/ordered-shutdown' into rlva/development
|
2020-06-10 15:19:15 +02:00 |
|
Kitty Barnett
|
492e870d9f
|
Merge branch 'rlva/bugfix/give-to-rlv' into rlva/development
|
2020-06-10 12:45:03 +02:00 |
|
Kitty Barnett
|
3bc3233a0b
|
Merge branch 'viewer/build' into viewer/build
|
2020-06-09 15:34:00 +02:00 |
|
Kitty Barnett
|
1bc3d1a186
|
Merge branch 'lindenlab/release' into viewer/build
|
2020-06-09 15:33:40 +02:00 |
|
Kitty Barnett
|
2fa3ad363a
|
Merge branch 'viewer/build' into viewer/build
|
2020-06-09 15:29:37 +02:00 |
|
Andrey Kleshchev
|
4c710e2878
|
SL-13329 Misalligned checkboxes in inventory filters
|
2020-05-28 23:25:21 +03:00 |
|
Andrey Kleshchev
|
952ec4bcda
|
SL-12607 Bar color to blue
|
2020-05-28 20:50:11 +03:00 |
|
Andrey Kleshchev
|
1fe92a9df9
|
SL-13340 Restored status display for login
|
2020-05-28 18:22:17 +03:00 |
|
Andrey Kleshchev
|
2e238f0ba8
|
SL-12665 Readjusted all logos
|
2020-05-28 17:17:54 +03:00 |
|
Andrey Kleshchev
|
36c27bf5ec
|
SL-12664 readjusted logo #2
|
2020-05-28 15:34:56 +03:00 |
|
Andrey Kleshchev
|
205546730e
|
SL-12664 readjusted logo
|
2020-05-28 12:09:08 +03:00 |
|
Andrey Kleshchev
|
c47516c442
|
SL-12607 Reverted to original logos
|
2020-05-28 11:25:04 +03:00 |
|
Andrey Kleshchev
|
d23e649169
|
Merged master into DRTVWR-508
|
2020-05-18 23:29:31 +03:00 |
|
Nat Goodspeed
|
ed3d9abdd0
|
Increment viewer version to 6.4.3
following promotion of DRTVWR-460
|
2020-05-18 16:26:52 -04:00 |
|
Kitty Barnett
|
e7e0ae63bd
|
CATZ-561: Move /MP compiler switch to the build-variables variables file
|
2020-05-16 15:40:51 +02:00 |
|
Andrey Kleshchev
|
53da10525e
|
SL-11445 pulled in fresh fmod studio package
|
2020-05-05 20:24:17 +03:00 |
|
Andrey Kleshchev
|
05bc927dd8
|
SL-12607 Revert changes to no longer necessary packages
This packages were needed for icons, but since icons are no longer needed, neither should packages change.
|
2020-05-05 20:24:17 +03:00 |
|
Kitty Barnett
|
fa01947caa
|
Merge branch 'lindenlab/release' into viewer/build
|
2020-05-05 13:29:53 +02:00 |
|
Kitty Barnett
|
a5f4e8dd09
|
Merge branch 'lindenlab/maint' into viewer/build
|
2020-05-05 01:21:14 +02:00 |
|
Andrey Lihatskiy
|
6364e2fff6
|
Merge branch 'master' into DRTVWR-460
|
2020-05-04 23:35:54 +03:00 |
|
Andrey Kleshchev
|
13f501b333
|
Merged master into DRTVWR-508
|
2020-05-04 19:34:48 +03:00 |
|
Nat Goodspeed
|
4a7fd0117a
|
Increment viewer version to 6.4.2
following promotion of DRTVWR-500
|
2020-05-04 12:15:30 -04:00 |
|
Kitty Barnett
|
8e4017c76d
|
Merge branch 'lindenlab/release' into viewer/build
|
2020-05-04 13:34:38 +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
|
00f561ec80
|
[FIXED] Toolbar and menu items no longer disable when their matching restrictions are active
|
2020-05-02 22:28:12 +02:00 |
|
Andrey Kleshchev
|
2bddce7cab
|
SL-12678 Removed auto login retry
|
2020-05-01 18:08:10 +03:00 |
|
Andrey Kleshchev
|
a6b3b98e52
|
SL-12898 Added https to allowed audio links
|
2020-04-30 22:11:34 +03:00 |
|
Andrey Lihatskiy
|
d3b10072f4
|
Merged in DRTVWR-460 (pull request #91)
SL-13133 Numerical camera preset names sorting order fix
Approved-by: Maxim Nikolenko
|
2020-04-28 17:31:50 +00:00 |
|
Andrey Lihatskiy
|
ec77b2e0ea
|
SL-13133 Numerical camera preset names sorting order fix
|
2020-04-28 19:07:55 +03:00 |
|
Andrey Kleshchev
|
49db074be4
|
SL-12678 Removed auto login retry
|
2020-04-27 17:36:47 +03:00 |
|
Kitty Barnett
|
a7e5b8ecc9
|
Restore the @setenv restriction
|
2020-04-27 00:07:19 +02:00 |
|
Kitty Barnett
|
af16b628f1
|
Merge branch 'lindenlab/viewer-eep' into viewer/eep
|
2020-04-26 23:12:08 +02:00 |
|
Andrey Lihatskiy
|
a0d7d87355
|
Merge branch 'master' into DRTVWR-460
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
|
2020-04-26 21:57:40 +03:00 |
|
Mnikolenko Productengine
|
2ea5c5986a
|
SL-12904 Temporarily use LLSD to avoid crashes on older viewers
|
2020-04-23 13:22:27 +03:00 |
|
Andrey Lihatskiy
|
f20b22e325
|
AMD CPUs list update
|
2020-04-21 00:35:19 +03:00 |
|
Andrey Kleshchev
|
231b51f40f
|
Restored SL-12732 after merge conflict
|
2020-04-20 22:20:16 +03:00 |
|
Andrey Kleshchev
|
d9783adba7
|
SL-13040 Fixed crash at EnvironmentPersistAcrossLogin
|
2020-04-20 22:03:06 +03:00 |
|
Andrey Lihatskiy
|
c757c29c95
|
Merge branch 'master' into DRTVWR-500
# Conflicts:
# indra/newview/pipeline.cpp
|
2020-04-20 21:23:34 +03:00 |