32b5aa20c3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-10-14 23:48:24 +02:00
42330f2008
Merge branch 'master' into DRTVWR-483
2020-10-14 22:01:05 +03:00
35708568d6
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# indra/newview/llfloatermodelpreview.cpp
2020-10-14 21:58:43 +03:00
5b89548761
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-09-23 12:14:36 +02:00
b5635da9e9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 10:08:11 +02:00
efbb274251
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 07:33:20 +02:00
41ac9cb015
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 06:52:54 +02:00
f4bfaeb45e
Merge branch 'master' into DRTVWR-483
2020-09-23 01:48:13 +03:00
825cfc2b6a
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterconversationpreview.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.h
# indra/newview/llvoicevivox.cpp
2020-09-22 23:30:12 +03:00
730af5d488
Merged master (DRTVWR-503) into DRTVWR-482
2020-09-22 22:51:33 +03:00
34444a0873
SL-13697 Items I am wearing continue to go to lost and found
...
Contribution from Ansariel Hiller
2020-09-21 23:47:08 +03:00
c49565be6e
SL-13858 FIXED Group chat transcripts named with double (group) (group).txt after opening chat history.
2020-08-25 21:19:41 +03:00
fc80d63a11
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-19 13:03:43 +02:00
7a22cc4fa5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-19 12:00:10 +02:00
0efda8f28d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-18 22:41:20 +02:00
9abbdb74f2
Merge branch 'master' into DRTVWR-483
2020-08-18 19:17:09 +03:00
b0274e1bdd
Merge branch 'master' into DRTVWR-482
2020-08-18 19:17:01 +03:00
a9885029cf
Merge branch 'master' into DRTVWR-507-maint
2020-08-18 19:11:34 +03:00
c5af669e3b
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-08-12 12:24:35 +02:00
d240d381a2
SL-13583 Some behavior tweaks #1
2020-08-12 00:59:45 +03:00
9406b757a3
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
2020-08-11 01:34:13 +03:00
3f1f5e884b
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-29 13:35:01 +02:00
67255f5d64
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-07-29 13:23:00 +02:00
350cf703a1
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-07-24 00:44:20 +02:00
b17e2aaff1
SL-13642 Updated contributions.txt
2020-07-22 06:48:15 +03:00
3c564f5afc
SL-11625 Fix for skewed baked texture offset values
2020-07-02 21:20:13 +03:00
9c022ddce1
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-24 13:49:06 +02:00
9114d7a524
SL-13364 FIXED Viewer crashes when opening Spell Check floater when "SpellCheck" is FALSE
2020-06-03 15:37:08 +03:00
e7c9024d75
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-03 12:28:08 +02:00
353afb48f2
SL-13239 Add 'Touch' to the various attachment context menus
2020-05-28 18:38:01 +03:00
7147dea550
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-24 18:42:19 +02:00
ae24afec8f
SL-13190 Allow Edit Attached Object Position From Inventory
2020-05-22 14:37:14 +03:00
a879e86b8e
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-19 21:53:26 +02:00
13086737cc
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-05-19 21:50:44 +02:00
aaaf3189c4
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
2020-05-19 22:37:41 +03:00
3a3e917f38
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-19 14:43:31 +02:00
f7ab3b2f4b
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-19 12:26:21 +02:00
05ad4de150
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
...
# Conflicts:
# indra/llxml/llcontrolgroupreader.h
# indra/newview/llviewerkeyboard.cpp
2020-05-19 10:20:31 +02:00
6c79fdd695
Merge branch 'master' into DRTVWR-507-maint
2020-05-19 10:49:11 +03:00
63004f50e3
Merge branch 'master' into DRTVWR-482
2020-05-19 10:47:00 +03:00
05800a402b
Merge branch 'master' into DRTVWR-483
2020-05-19 10:42:26 +03:00
510574dc14
Merge branch 'master' into DRTVWR-501-maint
...
# Conflicts:
# indra/llxml/llcontrolgroupreader.h
# indra/newview/llviewerkeyboard.cpp
2020-05-18 23:41:19 +03:00
0007ff2660
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-07 12:29:58 +02:00
e1504d8c56
SL-13178 Improve initial opening time of the landmarks floater
2020-05-05 21:09:42 +03:00
9c3368bbf6
SL-13178 Improve initial opening time of the landmarks floater
2020-05-05 19:08:55 +03:00
6afd505fa8
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-05 15:24:10 +02:00
ec9b989863
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-05 00:37:16 +03:00
67d8dda08c
Merge branch 'master' into DRTVWR-483
2020-05-04 23:39:23 +03:00
89e17d1780
Merge branch 'master' into DRTVWR-482
2020-05-04 23:39:10 +03:00
6364e2fff6
Merge branch 'master' into DRTVWR-460
2020-05-04 23:35:54 +03:00
66523963fd
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-04 21:00:08 +02:00
1d7810b916
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
2020-05-04 10:28:09 +02:00
9c31597e5e
SL-13141 Crashfix contribution
2020-04-30 17:51:46 +03:00
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
75cdb94de3
Merge branch 'master' of D:/Dev/phoenix-firestorm-camus
2020-04-23 19:14:47 +02:00
40b39f9990
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
...
# Conflicts:
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-04-23 18:13:29 +02:00
ddc7fc297b
Merge branch 'master' of D:/Dev/phoenix-firestorm-legacy-profiles
2020-04-23 18:08:09 +02:00
dbf00cf036
Merge branch 'master'
2020-04-23 17:40:31 +02:00
4cf4243573
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/de/floater_preview_texture.xml
# indra/newview/skins/default/xui/es/floater_preview_texture.xml
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/it/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/ru/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-04-21 15:37:25 +03:00
a4b1c0330a
Merge branch 'master' into DRTVWR-482
...
# Conflicts:
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
2020-04-21 13:12:05 +03:00
c757c29c95
Merge branch 'master' into DRTVWR-500
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
44fe667661
SL-12396 Triple clicking text in a textbox / textarea should only select the current line
2020-04-11 22:48:18 +02:00
85fb2b81d8
SL-11360 Viewer floods the server with GroupProfileRequest
2020-02-14 18:37:25 +00:00
b9f0eb54ce
SL-12396 Triple clicking text in a textbox / textarea should only select the current line
2020-02-12 12:45:56 +02:00
da365b227e
Merge Firestorm LGPL
2019-12-13 18:15:19 +01:00
4d09c68e4c
Merge Firestorm LGPL
2019-12-13 15:35:54 +01:00
8f3213d7d4
Merge Firestorm LGPL
2019-12-13 00:14:24 +01:00
d0c7b4fade
Merged in lindenlab/viewer-release
2019-11-27 08:19:22 +02:00
b371c5a35d
Merged in lindenlab/viewer-release
2019-10-31 21:13:12 +02:00
6e340961c0
Merge viewer-neko
2019-10-30 18:05:01 +01:00
5082b42d0a
Merged in lindenlab/viewer-release
2019-10-23 18:30:09 +03:00
1b4d5492c6
SL-11727 Fix build warnings
2019-10-23 16:37:15 +03:00
e35c22b8ee
Merge Firestorm LGPL
2019-10-18 18:29:27 +02:00
9b173f0b6e
Merge Firestorm LGPL
2019-10-17 22:55:13 +02:00
0cb17cd365
Merge Firestorm LGPL
2019-10-16 23:31:52 +02:00
c7747d2a1b
merge
2019-10-16 22:24:03 +01:00
014451229e
Merge Firestorm LGPL
2019-09-11 20:22:35 +02:00
9f005065d0
Merge Firestorm LGPL
2019-09-10 23:40:54 +02:00
8e82f50a76
Merged in lindenlab/viewer-release
2019-09-10 23:31:38 +03:00
4921618390
Merged in lindenlab/viewer-release
2019-09-10 23:30:52 +03:00
df79950138
Merge Firestorm LGPL
2019-09-10 21:55:47 +02:00
3609eabe54
Merge viewer-release 6.3.2
2019-09-10 12:07:01 -07:00
a97f13e161
Merge viewer-release 6.3.2
2019-09-10 10:19:50 -07:00
facd9ee175
Merge viewer-legacy-profiles
2019-08-19 22:18:50 +02:00
4087c4c077
Merge Firestorm LGPL
2019-08-13 20:17:51 +02:00
8a3ae3a97d
SL-10675 Updated contributions.txt
2019-07-22 20:36:22 +03:00
69f14e2f29
Initial merge of viewer-legacy-profiles
...
For the time being, use the Firestorm legacy profiles. Can be switched via FSUseOwnProfiles debug setting
2019-07-19 11:21:54 +02:00
3d1a765c61
Merge Firestorm LGPL
2019-07-12 19:21:10 +02:00
f03b696c3d
Merge viewe-release 6.2
2019-07-12 08:34:25 -07:00
ff536ef9c2
Merged in lindenlab/viewer-release
2019-06-29 06:37:27 +03:00
139c66b684
Merged in lindenlab/viewer-release
2019-06-28 02:19:25 +03:00
25d83975f4
Merge Firestorm LGPL
2019-06-22 20:54:01 +02:00
ad64edd9c0
Merged in lindenlab/viewer-lynx
2019-06-22 03:17:43 +03:00
13580377c4
Merged in lindenlab/viewer-release
2019-06-22 03:16:39 +03:00
768c3570ab
Merge Firestorm LGPL
2019-06-20 23:21:49 +02:00
e0ca19d8ab
Merge LL viewer-release 6.2.3
2019-06-20 23:14:11 +02:00
9313bc50c4
Merge the Rainbow
2019-06-20 13:42:00 -07:00
89a6a001fc
Merge viewer-neko
2019-06-17 21:48:11 +02:00
0574d03bfa
OPEN-345 Fixed enigmatic messages during build
2019-06-17 19:46:20 +03:00
b996c95f32
SL-11079 Updated contributions.txt
2019-05-28 23:52:23 +03:00
e6970af7a1
Merge Firestorm LGPL
2019-05-09 19:52:27 +02:00
428c15acfb
Merge Firestorm LGPL
2019-05-08 20:54:26 +02:00
3175525950
Merged in lindenlab/viewer-release
2019-05-08 21:41:56 +03:00
93f0023efa
Merged in lindenlab/viewer-release
2019-05-08 21:41:11 +03:00
65cb4b6d20
Merge 6.2.2
2019-05-08 10:37:34 -07:00
676aa1398c
Merge viewer-eep
2019-05-08 19:18:01 +02:00
470d1595cc
Merge viewer-release
2019-05-08 09:30:39 -07:00
6d377d07fa
Merge viewer-neko
2019-05-04 01:02:28 +02:00
be0c609eaf
SL-11072 FIXED Crash in LLInventoryAction::doToSelected(2406)
2019-05-02 13:11:18 +03:00
3961a9e80a
SL-11061 Viewer crashes on launch if serial is either unset or does not return a string
2019-04-30 15:24:49 +03:00
c35758512e
Merge Firestorm LGPL
2019-04-18 13:11:23 +02:00
5f8cca95f8
Merge 6.2.1
2019-04-17 11:24:08 -07:00
6ac2278308
Merge Firestorm LGPL
2019-04-17 19:46:33 +02:00
f14888b616
Merge 6.2.1
2019-04-17 08:43:14 -07:00
856cc1082b
Merge LL viewer-release 6.2.0
2019-04-17 17:12:42 +02:00
b5f8421839
Merged in lindenlab/viewer-release
2019-04-17 16:47:32 +03:00
922793e489
Merged in lindenlab/viewer-release
2019-04-17 16:47:13 +03:00
1d2ead44f6
Merge viewer-bear
2019-04-17 09:29:04 +02:00
82c68aca0d
Merge viewer-eep
2019-04-17 21:12:55 +02:00
579b76dcf3
Merge viewer-neko
2019-04-15 12:40:44 +02:00
724e3cca96
SL-10891 Reset UI scale factor on first run if OS's display scaling is not 100%
2019-04-11 00:19:58 +03:00
d7d8a15092
Fullbright + elimination of all references to calcFragAtmospherics.
...
--HG--
branch : OPEN-340
2019-04-10 02:49:25 -07:00
dcd8117b85
First stab at moving atmospheric var calcs to its own utility shader.
...
Still some work to go here. Largely related to how certain values (i.e., SSAO mix values) are supplied. But so far, so good.
--HG--
branch : OPEN-340
2019-04-09 22:35:40 -07:00
457df9cd67
SL-10891 Reset UI scale factor on first run if OS's display scaling is not 100%
2019-04-06 10:12:27 +03:00
d5971e939c
Merge Firestorm LGPL
2019-04-04 19:24:56 +02:00
2013578ca9
Update contributions.
...
--HG--
branch : BUG-226620
2019-04-03 16:07:39 -07:00
637a4f0956
Merge Firestorm LGPL
2019-04-03 20:39:01 +02:00
f89490c1de
Add attributions.
2019-04-02 17:03:35 -07:00
b8115d43c9
Merge 6.1.2
2019-04-02 14:32:59 -07:00
84d721c678
Merge Firestorm LGPL
2019-04-02 23:01:30 +02:00
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07:00
62bec6aa36
Merged in lindenlab/viewer-release
2019-04-02 22:21:35 +03:00
c6e310c7c2
Merged in lindenlab/viewer-release
2019-04-02 22:20:59 +03:00
1470e82c89
Merged in lindenlab/viewer-release
2019-04-02 21:51:54 +03:00
cc577bfa39
Merge viewer-eep
2019-03-31 10:59:37 +02:00
47e3c3aa21
BUG-226611, BUG-226617, BUG-226618: Update contrib file for Geenz Spad
2019-03-29 15:57:22 -07:00
766ae4d122
SL-10675 Updated contributions.txt
2019-03-05 00:10:13 +02:00
b0e32c3986
Merge viewer-cougar
2019-03-02 01:49:39 +01:00
599e081815
Backed out changeset: d5795c04fecc
2019-02-23 20:08:03 +02:00
f78ff79508
Update contributions list
2019-02-18 21:55:48 +02:00
536a3f6c8e
Merge viewer-neko
2019-01-18 23:41:21 +01:00
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
dd2636a2c2
Merge viewer-neko
2019-01-10 21:10:36 +01:00
09b750483a
SL-10293 Firestorm PR: preferences and menu search
2019-01-03 22:59:49 +02:00
f9ec853f4a
Merge viewer-neko
2019-01-03 19:07:09 +01:00
efa5f24d1b
SL-10288 Mesh uploader changes from Firestorm
2019-01-03 00:35:38 +02:00
da60cc476a
Merge viewer-release 6.0.2
2018-12-18 09:51:26 -08:00
428ca0689d
Merge Firestorm LGPL
2018-12-15 15:40:16 +01:00
74a56f30aa
Merged in lindenlab/viewer-release
2018-12-14 00:46:11 +02:00
0e36db79e1
Merge viewer-neko
2018-12-01 16:34:33 +01:00
3b932c27b7
SL-10288 Mesh uploader changes from Firestorm
2019-01-03 00:35:38 +02:00
3df143dd41
Merge Firestorm LGPL
2018-12-14 01:17:39 +01:00
baeca41027
SL-10089 Logs to see which gSavedSettings.get calls should be cached
2018-11-19 20:20:34 +02:00
1be44852f6
Merge viewer-neko
2018-10-19 14:09:13 +02:00
d757234397
SL-9800 Changed llTextBox to have selectable "message" text
2018-10-10 00:04:13 +03:00
697d2cdff4
STORM-2116: Add to Cinder Biscuits contributions.
2018-09-12 20:21:13 -04:00
5e3bbc20a5
Merge Firestorm LGPL
2018-08-03 02:07:41 +02:00
bd7ad9c157
Merge viewer-release
2018-08-02 23:02:42 +01:00
3edd9c1813
Merge Firestorm LGPL
2018-08-02 23:28:57 +02:00
3983f5b1e2
Merged in lindenlab/viewer-release
2018-08-02 23:18:28 +03:00
abb1d8696a
Merge viewer-cougar
2018-06-25 23:00:46 +02:00
4c4b76ab37
Merge viewer-neko
2018-06-22 22:22:26 +02:00
21f19cb6f0
Merged in lindenlab/viewer-release
2018-06-22 11:08:36 +03:00
23355c795f
Merge Firestorm LGPL
2018-06-21 20:02:11 +02:00
2db71067f2
Merge 5.1.7
2018-06-21 17:39:13 +01:00
253a767fa3
Backed out changeset: 4ce8c663a9a0
...
STORM-2122: UDP data bandwidth measuring is off by factor 8
2018-06-19 21:20:48 +03:00
b0e5bee0b4
MAINT-8723 - Selecting mesh objects make several HUD-related items invisible
...
FIXED (from FS Ansariel patches)
2018-06-07 18:46:03 +03:00
efa8baca1d
Merge viewer-camus
2018-06-05 13:21:11 +02:00
2862283c7e
Merge Firestorm LGPL
2018-06-01 20:50:03 +02:00
3ed3cfce56
Merge 5.1.6
2018-05-31 20:12:26 +01:00
eb8eaa58a4
Merge storm-2145 dev into lindenlab branch parented from viewer-release
2018-05-31 17:10:48 +01:00
9437d1511e
merge from viewer-release
2018-06-01 01:18:47 +03:00
3f331bb24c
Merge Firestorm LGPL
2018-05-18 10:32:56 +02:00
64b3473f49
Merged in lindenlab/viewer-release
2018-05-18 03:02:44 +03:00
7e7984fcfd
Merge viewer-neko
2018-05-01 18:42:59 +02:00
5d924483a8
Merge viewer-cougar
2018-03-02 15:00:48 +01:00
af9069edbf
Merged in lindenlab/viewer-release
2018-03-02 00:47:08 +02:00
bff875d25f
STORM-2145 Camera controls opacity is now working
2018-02-02 10:39:59 -05:00
25350b9422
Merge viewer-neko
2018-01-30 15:39:28 +01:00
a7911c4379
merge changes for 5.1.0-release
2018-01-19 11:18:29 -05:00
0b6176dea9
Merge Firestorm LGPL
2018-01-25 21:57:38 +01:00
2269a9f074
MAINT-8085 done right
2018-01-17 13:31:26 +01:00
f6e3684f6e
Merge Firestorm LGPL
2018-01-17 12:07:54 +01:00
57a99273ed
Merged in lindenlab/viewer-release
2018-01-17 03:20:12 +02:00
1e586749ef
STORM-2145 Merge up to viewer-release
2018-01-12 09:08:49 -05:00
e7715f7a31
Merge Firestorm LGPL
2017-11-30 20:33:07 +01:00
c9e417c8a6
Merge viewer-neko
2017-11-30 01:19:29 +01:00
e3a2c5e321
DRTVWR-418: Merge from latest viewer-release
2017-11-29 14:47:09 -05:00
c606bc3492
Merge viewer-lynx
2017-11-12 12:28:28 +01:00
3af72c575b
Merge viewer-neko
2017-10-24 09:42:19 +02:00
f1c76a376c
STORM-2151: Respect "Hide cursor while typing" user setting on Windows
2017-10-16 10:41:45 +02:00
788d745071
MAINT-7899 FIXED Apparent broken material texture selection
2017-10-13 12:23:08 +03:00
18fa2e6471
MAINT-7081 [FIXED] Access (write) violation / buffer overrun in LLTextureFetchWorker::doWork()
...
The trouble lines are:
U8 * buffer = (U8 *) ALLOCATE_MEM(LLImageBase::getPrivatePool(), total_size);
if (cur_size > 0)
{
memcpy(buffer, mFormattedImage->getData(), cur_size);
}
If 'cur_size > mHttpReplyOffset + append_size' then 'total_size -= src_offset' will cause
total_size to be smaller than cur_size causing a write access violation on the memcpy.
Since the response is invalid it seemed best to make it follow the other failed partial condition.
(transplanted from 737e28ec6b4d74f3ff915a4effc13d7b615a6a9b)
2017-10-12 22:55:15 +02:00
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
06db7c626f
Merge Firestorm LGPL
2017-10-11 17:58:16 +02:00
c47b8c27ba
Merge Firestorm LGPL
2017-08-23 17:53:48 +02:00
01e0b78c59
merge changes for DRTVWR-439
2017-08-16 15:43:58 -04:00
9f099336e7
Merge viewer-lynx
2017-08-04 18:28:07 +02:00
77d083c52e
Clean up contributions file
2017-07-29 13:12:51 +02:00
e6f9a5e2db
Merge viewer64
2017-07-27 21:07:14 +02:00
e07d6bc4f1
Merge viewer-neko
2017-07-18 21:37:09 +02:00
f7186ac260
Contributors list fix: NickyD and Nicky Dasmijn are the same person
2017-07-11 20:46:53 +03:00
5d812b95e8
MAINT-7581 [contribution] Closing the 'Replace links' floater crashes the viewer if a replace is in progress
2017-07-11 14:54:29 +03:00
b0d8f3a1ab
MAINT-4532: properly detect Windows 10 in the 64bit build (only - 32bit runs in Windows 8 compatibility mode)
2017-07-10 16:30:28 -04:00
530f69ff33
MAINT-7541 Not able to save login credentials on clean install
2017-07-10 17:22:12 +03:00
5478f2a223
MAINT-7581 [contribution] Closing the 'Replace links' floater crashes the viewer if a replace is in progress
2017-07-11 14:54:29 +03:00
d2b93c74f9
Merge Firestorm LGPL
2017-06-20 23:07:41 +02:00
270cd8ff15
Merged in lindenlab/viewer-release
2017-06-20 23:16:03 +03:00
5d84299cee
Merge Firestorm LGPL
2017-06-19 21:23:53 +02:00
2347b25808
Merge viewer-neko
2017-06-09 11:49:10 +02:00
d7edeb2df8
STORM-2149: Add a warning notification when deleting a folder of filtered content
2017-06-02 16:44:00 +02:00
5205be0c65
STORM-2148 Crash on trying to save texture file(s) to computer from inventory
2017-05-31 19:28:46 +03:00
cebd833609
STORM-2148 Crash on trying to save texture file(s) to computer from inventory
2017-05-31 19:28:46 +03:00
97cea29fac
Sync contributions.txt with upstream
2017-06-09 09:39:15 +02:00
a8d3d16809
Merge Firestorm LGPL
2017-05-22 22:45:47 +02:00
806fd24704
merge
2017-05-22 21:09:07 +01:00
f1cb7185f7
Merge asset-http
2017-05-07 16:10:30 +02:00
dcac0dce59
Merge viewer-bear
2017-05-07 13:11:50 +02:00
ed9653f711
MAINT-7343 - contributions.txt update
2017-05-01 15:17:28 -04:00
d4d56f004a
MAINT-7074 Fixed ability to escape from skin directory with <icon>
2017-04-19 21:19:04 +03:00
b59ac959fc
MAINT-6519 Contribution, adds feature to replace inventory links
2017-04-27 19:19:11 +02:00
5c4ae5b11a
STORM-2145 Camera Presets -- some initial work
2017-02-23 17:50:36 -05:00
dd69a22834
Merge viewer-bear
2017-01-27 09:42:51 +01:00
e3d5861aa0
Merge viewer-lynx
2017-01-25 11:12:16 +01:00
5d7c5ea4d2
MAINT-7059 [contribution] Import of custom spellcheck dictionary fails silently
2017-01-18 12:20:55 +02:00
6b59d55230
MAINT-7028 Fixes scrambling of Outfit Order in Appearance Panel
2017-01-06 01:25:15 +02:00
e4497dcb87
Merge viewer-lynx
2017-01-02 12:24:50 +01:00
946b28ad76
Merged STORM-2142
2016-12-19 19:18:53 +02:00
645301633f
STORM-2144 - Guard against null pointers when LLPanelOutfitEdit gets called before postBuild() on login.
2016-12-15 09:34:04 -06:00
a6cda1ee06
STORM-2144 - Guard against null pointers when LLPanelOutfitEdit gets called before postBuild() on login.
2016-12-15 09:34:04 -06:00
1e292b4735
Backed out changeset: 7b22662b83b2 - This stays in and has nothing to do with mesh LOD calculation
2016-12-15 09:48:09 +01:00
31be233b66
Merge viewer-lynx
2016-12-15 09:46:35 +01:00
7dcea20c4d
Backed out changeset: b1a30962dd54
2016-12-15 02:41:39 +02:00
8c083cf771
Merge Firestorm LGPL
2016-12-05 22:40:59 +01:00
2abd0eef41
Merged in lindenlab/viewer-release
...
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
e2919977d6
Merge viewer-lynx
2016-11-30 11:15:04 +01:00
aa25acc045
Merge Firestorm LGPL
2016-11-30 09:43:52 +01:00
56c718681a
Merge Firestorm LGPL
2016-11-21 10:08:02 +01:00
fb9cb88272
STORM-2143 Correct vertex winding of stars
2016-11-19 22:25:39 -05:00
07bb7bc846
STORM-2143 Correct vertex winding of stars
2016-11-19 22:25:39 -05:00
76b3efe01c
MAINT-6953 [Contribution] Error in DPI scaling calculation
2016-11-19 11:19:01 +00:00
fb0355fdba
Merged in Ansariel/storm-2141
2016-11-21 21:18:13 +02:00
ec5051699a
STORM-2142 Tweaks to some of the 4 combined issues
2016-11-16 11:21:54 -05:00
5a58635b64
Merge Firestorm LGPL
2016-11-16 16:11:56 +01:00
84222286cc
MAINT-6917 Setting one avatar to "Do not render" causes all avatars to become imposters
2017-11-09 23:05:35 +02:00
d31596db6a
merge
2016-11-16 08:39:41 -05:00
6afe3d7f05
Update contributions.txt
2016-11-16 11:33:23 +01:00
c182741596
Merge viewer-lynx
2016-11-16 09:55:54 +01:00
420b1c9429
STORM-2141: Fix various inventory floater related issues:
...
* Opening new inventory via Control-Shift-I shortcut uses legacy and potentinally dangerous code path
* Closing new inventory windows don't release memory
* During shutdown legacy and inoperable code for inventory window cleanup is called
* Remove old and unused inventory legacy code
2016-11-14 14:45:53 +01:00
18dfdc2ae0
Merge bento-box
2016-11-11 16:00:37 +01:00
Ansariel