1d2ead44f6
Merge viewer-bear
2019-04-17 09:29:04 +02: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
84d721c678
Merge Firestorm LGPL
2019-04-02 23:01:30 +02:00
1470e82c89
Merged in lindenlab/viewer-release
2019-04-02 21:51:54 +03: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
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
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
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
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
2862283c7e
Merge Firestorm LGPL
2018-06-01 20:50:03 +02: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
25350b9422
Merge viewer-neko
2018-01-30 15:39:28 +01: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
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
Ansariel