d2963a5e60
Merge viewer-cougar
2018-07-11 20:48:32 +02:00
524fbefd2a
Merge
2018-06-27 15:28:26 +01:00
c0413250b7
Merge 5.1.5
2018-05-18 19:25:54 +01:00
97028be9c8
Merge Firestorm LGPL Lynx
2018-05-08 20:29:47 +02:00
31a1ba1701
Merge Firestorm LGPL
2018-05-08 18:31:13 +02:00
c0e16b2800
Add stats for tex cache read / decode / fetch latency for comparison of old cache code with TCO.
2018-04-11 20:14:33 +01:00
7cc408a5cd
Merge.
2018-04-10 12:33:45 +02:00
9203b70ca3
Merge viewer-neko
2018-04-07 13:40:21 +02:00
ef20e3f523
Replace ARP Mutex and Condition with std::mutx and std::conditional_variable
2018-04-05 12:02:12 +02:00
ccec3d40bd
MAINT-8468 Increase max bandwidth on the viewer to 6mbps
2018-03-30 16:47:29 +03:00
25350b9422
Merge viewer-neko
2018-01-30 15:39:28 +01:00
6e445e82e2
MAINT-8091 Removed deprecated and unused private memory pooling
2018-01-30 14:03:26 +00:00
34d3b49d1f
MAINT-2124 Texture allocation issues
2017-12-05 17:54:17 +02:00
083b93d2f9
MAINT-2124 Texture allocation issues
2017-12-05 17:54:17 +02:00
73d40edbd6
Merge Firestorm LGPL
2017-10-24 09:44:35 +02:00
3af72c575b
Merge viewer-neko
2017-10-24 09:42:19 +02:00
72b0cb1467
MAINT-7779 Logging update
2017-10-18 16:31:36 +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
1a676b2882
[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.
2017-10-12 22:55:15 +02:00
9fdaca989e
Merge viewer-bear
2017-10-05 16:25:10 +02:00
5cd56406ab
SL-683 Fixed Logging parameters not taking effect immediately
2017-09-20 15:53:34 +03:00
3e4fda414e
MAINT-7343 - improved error case handling and checking for unlikely corners
2017-05-09 10:58:43 -04:00
8528a9ae13
MAINT-7343 - improved error case handling and checking for unlikely corners
2017-05-09 10:58:43 -04:00
f1cb7185f7
Merge asset-http
2017-05-07 16:10:30 +02:00
b7b8d6e1ae
MAINT-7343 - added periodic logging of state of the asset store.
2017-04-26 12:39:14 -04:00
c7473d4b99
Merge asset-http
2017-04-19 23:16:13 +02:00
a1b6e9b438
MAINT-7166 - diagnostics for movement
2017-03-29 20:29:40 -04:00
ca74323ee8
SL-409 - added version field = 2 to asset stats, made viewer-side metrics files exactly match the payload sent to simulator.
2017-03-21 08:56:30 -04:00
afef92cafc
Merge asset-http
2017-03-20 17:13:42 +01:00
e9c786ec60
SL-409 - fixes for viewer asset metrics. Copy and/or assignment of Recording objects is failing, changed to create LLSD blob earlier and just copy that.
2017-03-10 11:29:48 -05:00
8230bfbe9b
OpenSim: Re-add legacy GetMesh, GetMesh2 & GetTexture viewer caps
2017-03-08 23:16:11 +01:00
f028290c9e
SL-409 - added size stats to metrics for textures
2017-03-07 08:06:03 -05:00
07d91c5d19
Merge asset-http
2017-03-06 22:48:05 +01:00
09a6daabd2
SL-409 - consolidated user of ViewerAsset cap for mesh and texture fetching as well.
2017-03-06 14:31:31 -05:00
12df60d4e1
Major overhaul of the asset blacklist floater:
...
* Use sorting persistance already available in LLScrollListCtrl and remove specific asset blacklist debug settings
* Add right-click context menu
* Draw stripes for alternating lines for easier reading
* Add missing "Close" button
* Add filter editor for searching for particular assets
* Properly format date based on localizable format string and show time as local time instead of UTC
* Renamed classes to better fit the Firestorm naming system
* Removed unused methods
2016-08-26 11:58:18 +02:00
a0188a5358
Merge Firestorm LGPL
2016-05-09 12:41:24 +02:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
2797c5938a
Merge Firestorm LGPL
2016-04-05 10:47:23 +02:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
df4205dc46
Merge viewer-bear
2016-04-02 03:52:29 +02:00
a50faa943c
Merge.
2016-04-01 12:59:37 +02:00
0ff6fa576a
Merged in lindenlab/viewer-bear
2016-04-01 06:18:49 +03:00
0e155c51a9
MAINT-6257 Textures loading issues.
2016-03-29 18:52:54 +03:00
d171e16c58
Merge Firestorm LGPL
2016-03-18 10:16:25 +01:00
b8c1976460
Merge
2016-03-17 13:14:21 -07:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
30f9287645
MAINT-2199 reverted previous change, refixed missing cloud and ban line
2016-03-03 00:15:33 +02:00
b3e7fff9ae
MAINT-2199 restored original UI mechanics, removed icons from UI list
2016-02-27 16:06:54 +02:00
0a741843ca
Merge viewer-bear
2016-02-21 02:35:15 +01:00
Ansariel