8e4abf8ea3
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-06-10 13:52:52 +02:00
220afbcda0
SL-17285 Add proper reflection probe support to LLVOVolume, LLPrimitive, and LLPanelVolume
2022-06-02 18:42:38 -05:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
e5cd9cb90f
merge
2021-10-22 18:11:48 +01:00
d00272e0cc
SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default.
2021-10-11 16:03:40 +00:00
a184a0fbee
SL-15999 - noninteractive mode: create minimal objects,load no textures
2021-09-28 20:10:06 +01:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
3950341916
SL-15177 Added LLTextureFetchTester to log texture fetching state timers
2021-04-29 17:37:26 +03:00
e7c9024d75
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-03 12:28:08 +02:00
2938b8238c
SL-12889 Failed to cache image crashes
2020-05-25 23:59:56 +03:00
542efcb301
Merge Firestorm LGPL
2019-07-20 20:38:10 +02:00
f3ed1dd26b
Make GCC happy about if statement (&& could never be evaluated to true)
2019-07-17 22:43:12 +02:00
89a6a001fc
Merge viewer-neko
2019-06-17 21:48:11 +02:00
d081df14ef
SL-11309 Crash on attempt to costruct singletone
2019-05-29 19:28:52 +03:00
81b58bbda7
Merge viewer-neko
2019-05-07 23:21:06 +02:00
a6cc3b7159
SL-11074 FIXED "Cache Hit Rate" in Statistics is broken
2019-05-06 17:14:55 +03:00
84d721c678
Merge Firestorm LGPL
2019-04-02 23:01:30 +02:00
65bf63c973
Merged in lindenlab/viewer-bear
2019-04-02 22:12:55 +03: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
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
Ansariel