63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
98129be5ef
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-17 15:45:05 +02:00
372ed555ed
SL-13348 Thread crashing singleton #2
...
Reverted LLImage to singleton conversion
2020-05-29 21:53:43 +03:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
17fae30f72
DRTVWR-493 LLImage to LLParamSingleton
2019-07-25 15:17:11 +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
a5cb8fdbee
Sync LLImageJ2C for upcoming fix with LL
2017-12-06 16:57:08 +01:00
cb89140d29
Merge LL release 4.0.7
2016-08-11 23:42:52 +02:00
acdb050ce5
MAINT-6584: Convert LLImage class hierarchy to standard 'bool'
...
instead of legacy BOOL.
2016-07-22 11:35:23 -04:00
71b593e88b
MAINT-6584: Streamline static LLImageJ2C implementation API.
...
Specifically, remove unused function pointer types CreateLLImageJ2CFunction,
DestroyLLImageJ2CFunction and EngineInfoLLImageJ2CFunction.
Also eliminate static fallbackDestroyLLImageJ2CImpl() and
fallbackEngineInfoLLImageJ2CImpl(), leaving only static
fallbackCreateLLImageJ2CImpl().
We do need a factory function to instantiate the appropriate LLImageJ2CImpl
subclass, so leave the fallbackCreateLLImageJ2CImpl() link seam in place.
However, given that every known LLImageJ2CImpl subclass is cheap to
instantiate, make getEngineInfo() a pure virtual method on that subclass: the
static LLImageJ2C::getEngineInfo() method can temporarily construct an
instance to query. While we're at it, make getEngineInfo() return std::string
like LLImageJ2C::getEngineInfo(). It's ridiculous that
fallbackEngineInfoLLImageJ2CImpl() implementations constructed a static
std::string and returned its c_str(), only to have LLImageJ2C::getEngineInfo()
construct ANOTHER std::string from the returned const char*.
fallbackDestroyLLImageJ2CImpl() never did anything useful: it merely deleted
the passed LLImageJ2CImpl subclass pointer as the specific subclass type. But
since LLImageJ2CImpl's destructor is virtual, LLImageJ2C's destructor could
simply delete the stored LLImageJ2CImpl*. In fact, make mImpl a
boost::scoped_ptr<LLImageJ2CImpl> so we don't even have to delete it manually.
2016-07-21 16:49:02 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
6095a2072d
more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL)
2014-06-10 08:01:16 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
12f0f8cb72
changed over to manual naming of MemTrackable stats
...
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
e40065f82c
BUILDFIX: #include and dependency cleanup
2013-07-19 15:03:05 -07:00
075a7bcc98
SH-4297 WIP interesting: viewer-interesting starts loading cached scene late
...
dependency cleanup - removed a lot of unecessary includes
2013-07-18 15:09:45 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
31955780d3
Backed out changeset: 426b89263aba: Causes crash due to heap corruption
2013-03-23 23:01:20 +01:00
eadca62857
Pull fix for heap corruption warning due to freeing new[]'ed memory with free() from Kitty Barnett / Catznip viewer
2013-03-23 21:43:50 +01:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
7893cf238d
Add ndfile.h into llapr.h so it is visible where needed. Add typedef apr_file_t tFiletype to LLAPRFile and then use this in all classes instead of apr_file_t, this way we can swap between LLAPRFile and ndFile with use a typedef
2013-01-23 02:25:14 +01:00
0fddd0f4de
Backout Rev 18389. String returns correctly with KDU 7.1
2012-12-23 11:20:08 -07:00
5b5f4c8bf5
Merge LL 3.4.2 release,
...
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
1777fa5187
Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148
2012-05-25 15:07:22 -07:00
60f602d5e1
Pull from VirLinden/drano
2012-05-08 10:18:03 -07:00
5c11b6b2e5
SH-3047 : Tweak of the performance compression data gathering code
2012-05-08 10:16:14 -07:00
29da931051
SH-3047 : Tweak of the performance compression data gathering code
2012-05-08 10:16:14 -07:00
678864e4ed
merge viewer-release to drano
2012-05-02 13:00:59 -04:00
adf5b5c1ef
Final pull from viewer-thx1138
2012-04-13 17:20:53 -07:00
8b3703bd03
SH-3060 : Always use old byte range on low res (faster), reserve new byte range for high res.
2012-04-13 15:42:54 -07:00
8778010fee
fix for linux build failure
2012-04-13 17:03:29 -04:00
c410a4e332
SH-3080 : Implement the TextureReverseByteRange setting so we can play with that parameter
2012-04-12 20:19:56 -07:00
172b45d5a2
SH-3060 : Complete new byte range computation, clean up and back pedal on some changes that didn't pay of.
2012-04-06 18:28:47 -07:00
91094d92a7
SH-3060 : Implement new byte range computation, cleaned up use of compression rate as well.
2012-04-05 22:05:00 -07:00
782981866a
SH-3060 : New byte range implementation. Intermediate (not working) state.
2012-04-04 18:58:34 -07:00
df09fd8e8b
SH-3060 : Preliminary implementation of the new byte range computation, implement setting to turn it on or off
2012-04-02 19:05:32 -07:00
bc6f669ff4
SH-3047 : Read the number of levels from the j2c image header instead of relying on hacked computation based on width / height.
2012-03-15 13:01:14 -07:00
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
5a14a67e06
converted a bunch of narrowing implicit conversions to explicit
2012-02-01 13:03:46 -08:00
4924f0c99b
b782a75c99e6 backout cleanup
2011-10-14 12:38:48 -05:00
c0ca8e5e2e
Merge backout of b782a75c99e6
2011-10-14 11:58:35 -05:00
4331c112ab
Backed out changeset b782a75c99e6
2011-10-14 11:52:40 -05:00
Ansariel