b371c5a35d
Merged in lindenlab/viewer-release
2019-10-31 21:13:12 +02:00
a97f13e161
Merge viewer-release 6.3.2
2019-09-10 10:19:50 -07:00
f03b696c3d
Merge viewe-release 6.2
2019-07-12 08:34:25 -07: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
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
65cb4b6d20
Merge 6.2.2
2019-05-08 10:37:34 -07:00
f14888b616
Merge 6.2.1
2019-04-17 08:43:14 -07: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
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
b8115d43c9
Merge 6.1.2
2019-04-02 14:32:59 -07:00
1470e82c89
Merged in lindenlab/viewer-release
2019-04-02 21:51:54 +03: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
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
09b750483a
SL-10293 Firestorm PR: preferences and menu search
2019-01-03 22:59:49 +02: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
74a56f30aa
Merged in lindenlab/viewer-release
2018-12-14 00:46:11 +02:00
baeca41027
SL-10089 Logs to see which gSavedSettings.get calls should be cached
2018-11-19 20:20:34 +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
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
bd7ad9c157
Merge viewer-release
2018-08-02 23:02:42 +01:00
3983f5b1e2
Merged in lindenlab/viewer-release
2018-08-02 23:18:28 +03:00
21f19cb6f0
Merged in lindenlab/viewer-release
2018-06-22 11:08:36 +03: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
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
64b3473f49
Merged in lindenlab/viewer-release
2018-05-18 03:02:44 +03: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
a7911c4379
merge changes for 5.1.0-release
2018-01-19 11:18:29 -05:00
2269a9f074
MAINT-8085 done right
2018-01-17 13:31:26 +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
e3a2c5e321
DRTVWR-418: Merge from latest viewer-release
2017-11-29 14:47:09 -05:00
f1c76a376c
STORM-2151: Respect "Hide cursor while typing" user setting on Windows
2017-10-16 10:41:45 +02: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
788d745071
MAINT-7899 FIXED Apparent broken material texture selection
2017-10-13 12:23:08 +03:00
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
01e0b78c59
merge changes for DRTVWR-439
2017-08-16 15:43:58 -04: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
270cd8ff15
Merged in lindenlab/viewer-release
2017-06-20 23:16:03 +03:00
f7186ac260
Contributors list fix: NickyD and Nicky Dasmijn are the same person
2017-07-11 20:46:53 +03:00
AndreyL ProductEngine