25350b9422
Merge viewer-neko
2018-01-30 15:39:28 +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
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
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
Ansariel