2b604adf7b
SH-2244 Fix for linux build?
2011-09-23 23:39:45 -05:00
4f2b20a30d
SH-2244 Fix for mac build? (take two)
2011-09-23 20:47:55 -05:00
4821a22070
SH-2244 Fix for mac build?
2011-09-23 18:29:38 -05:00
57620a9da9
SH-2244 Vertex buffer cleanup, fix for bad vertices in rigged attachments, added "RenderUseVAO" debug setting to control whether or not to use VAO's in non-core GL profiles.
2011-09-23 17:59:05 -05:00
b9926e8f57
SH-2244 Better VAO support -- still slower than non-VAO implementation for some reason
2011-09-23 02:29:53 -05:00
d3f614e2e9
SH-2244 fix flickering shadows and occlusion culling.
2011-09-22 13:41:26 -05:00
a1a7120299
SH-2244 fix for glitched fonts
2011-09-22 12:57:17 -05:00
3115e250ff
SH-2244 Don't use VAO's outside of core profile (performance improvement)
2011-09-22 00:57:47 -05:00
e7b743d80b
SH-2244 Fix for artifacts with L&S enabled when using core profile.
2011-09-22 00:33:27 -05:00
a2d08a6d80
SH-2244 Fix "RenderGLCoreProfile" actually make a core profile context and modify viewer to run under said context without generating errors.
2011-09-22 00:10:57 -05:00
66acb932ba
SH-2244 Add "RenderGLCoreProfile" debug setting that allows the viewer to start with a non-compatibility-profile OpenGL context.
2011-09-20 03:34:09 -05:00
9ea41c8094
SH-2243 No deprecated calls for the whole session.
2011-09-20 00:54:37 -05:00
2ead169131
SH-2243 fix for error in cloth shader
2011-09-19 17:41:29 -05:00
861b7eba60
SH-2243 fix for mac build
2011-09-17 19:02:21 -05:00
421e52ff98
SH-2243 work in progress -- gDEBugger guided removal of deprecated state changes
2011-09-17 02:36:43 -05:00
0c2876ef2c
SH-2243 work in progress -- how'd that GL get there?
2011-09-17 00:25:49 -05:00
4f99ace069
SH-2243 work in progress -- put back ambient lighting when atmospheric shaders disabled.
2011-09-17 00:19:19 -05:00
8a1baaea6c
SH-2243 work in progress -- don't use gl_FragColor or gl_FragData for outputs -- no more deprecation warnings on nvidia
2011-09-16 17:08:39 -05:00
da84f55527
SH-2243 work in progress -- don't use deprecated shader state
2011-09-16 12:40:53 -05:00
4fea7dcb3e
SH-2243 work in progress -- use a hash check to avoid redundantly setting light state
2011-09-15 17:10:33 -05:00
24ae2fb5af
SH-2243 work in progress -- don't use built-in GL light state when shaders are available.
2011-09-15 16:38:31 -05:00
f72a24bf3a
merge
2011-09-15 00:55:11 -05:00
530981a214
SH-2243 work in progress -- no more deprecated built-in matrix state when using shaders.
2011-09-15 00:54:25 -05:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
758b936dea
Trying to fix Mac build issue
2011-09-14 13:24:31 -04:00
c0ca2c62fd
merge
2011-09-13 16:11:22 -05:00
19371a9abe
STORM-1562 Potential fix for crash in LLCurl::run -- make sure all ref counted members of llsecapi are thread safe
2011-09-13 13:09:10 -05:00
0a0ae2dd3f
STORM-1562 Potential fix for crash in LLCurl::run -- don't run curl_multi_perform from multiple threads simultaneously.
2011-09-13 12:45:28 -05:00
18af6e397e
merge changes for storm-1590
2011-09-09 12:43:07 -04:00
5a03453b2c
Corrected license information in llsingleton_test.cpp.
2011-09-08 11:03:21 -04:00
89b9800579
merge back beta tags
2011-09-08 11:02:28 -04:00
7d381c6596
LLProxy: Moved the enabling of the UDP proxy back into startSOCKSProxy()
2011-09-08 10:43:07 -04:00
3d295fbf27
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-07 18:14:40 -04:00
286342f705
STORM-1541: Change llassert() to llassert_always(): unit tests expect.
...
Now that we have unit tests that require assertion failure if you try to
delete an LLInstanceTracker subclass instance with an iterator loose, having
llassert() "sometimes" compile away (whimsically, depending on platform as
well as build type!) makes those tests fail. Use llassert_always() instead.
2011-09-07 18:03:25 -04:00
b4a1d339fc
STORM-1541: Add LLInstanceTracker tests for active-iterator asserts.
...
The recent class-static LLInstanceTracker::instance_iter and key_iter
reference count is intended to guard against deleting an instance of an
LLInstanceTracker subclass during iteration. Add tests for that functionality.
2011-09-07 17:29:08 -04:00
b8fddce34d
Merge. Fixed issue with LLProxy code related to changes to the LLSocket interface.
2011-09-07 16:40:40 -04:00
8c6f752982
STORM-1541: Hoist LLInstanceTracker::getMap_() to base getStatic().
...
Generalize the notion of getting some chunk of "static" storage: introduce
LLInstanceTrackerBase::getStatic() template method. Define StaticData struct
containing the InstanceMap (or InstanceSet, for that specialization) along
with the S32 that caused the VS2010 linker so much grief. Completely eliminate
that S32 as an actual class-static member, qualifying all references with the
struct returned by getStatic().
In LLInstanceTrackerBase::getInstances(), use one std::map lookup instead of
three.
2011-09-06 22:07:49 -04:00
f73b795bb7
Renamed LLCurl::check_curl_code() and LLCurl::check_curl_multi_code() to prevent ambiguous name build error.
2011-09-06 17:33:18 -04:00
82b1b1bc6e
merge changes for storm-1588
2011-09-06 17:00:55 -04:00
e2dea0b494
merge changes for vwr-26823
2011-09-06 17:00:23 -04:00
a8d49f7cf5
LLProxy code review fixes.
...
* Removed check_curl_code and check_curl_multi_code from the global namespace.
* Added comments documenting which thread the public methods of LLProxy should be called from.
* Corrected grammar in LLSingleton.h
* Fixed a buffer scope problem in llpacketring.cpp.
2011-09-06 16:54:53 -04:00
fc45e9cbf6
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-02 20:24:06 -07:00
f6a8fbe19f
merge changes for .v-pb
2011-09-02 16:03:20 -04:00
a2a73feed0
merge back beta tags
2011-09-02 16:03:09 -04:00
0ab6eee099
merge changes for storm-1027
2011-09-02 13:48:29 -04:00
8efd992d50
correct DOS line endings
2011-09-02 13:48:01 -04:00
ba2ae6bc95
re-write the hash table code to eliminate potential flaws and simplify the implementation.
2011-09-02 11:17:03 -06:00
1f149a432b
merged .hgtags
2011-09-02 10:23:46 -04:00
deddcfb8c5
Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aa
2011-09-02 10:13:04 -04:00
fcc51bd5b0
increment viewer version to 3.0.5
2011-09-02 09:46:48 -04:00
Dave Parks