summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-09-15SH-2243 work in progress -- don't use built-in GL light state when shaders ↵Dave Parks
are available.
2011-09-15mergeDave Parks
2011-09-15SH-2243 work in progress -- no more deprecated built-in matrix state when ↵Dave Parks
using shaders.
2011-09-14SH-2243 work in progress -- application side matrix stack managementDave Parks
2011-09-14Trying to fix Mac build issueBrad Payne (Vir Linden)
2011-09-13mergeDave Parks
2011-09-13STORM-1562 Potential fix for crash in LLCurl::run -- make sure all ref ↵Dave Parks
counted members of llsecapi are thread safe
2011-09-13STORM-1562 Potential fix for crash in LLCurl::run -- don't run ↵Dave Parks
curl_multi_perform from multiple threads simultaneously.
2011-09-09merge changes for storm-1590Oz Linden
2011-09-08Corrected license information in llsingleton_test.cpp.Logan Dethrow
2011-09-08merge back beta tagsOz Linden
2011-09-08LLProxy: Moved the enabling of the UDP proxy back into startSOCKSProxy()Logan Dethrow
2011-09-07Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-09-07STORM-1541: Change llassert() to llassert_always(): unit tests expect.Nat Goodspeed
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-07STORM-1541: Add LLInstanceTracker tests for active-iterator asserts.Nat Goodspeed
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-07Merge. Fixed issue with LLProxy code related to changes to the LLSocket ↵Logan Dethrow
interface.
2011-09-06STORM-1541: Hoist LLInstanceTracker::getMap_() to base getStatic().Nat Goodspeed
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-06Renamed LLCurl::check_curl_code() and LLCurl::check_curl_multi_code() to ↵Logan Dethrow
prevent ambiguous name build error.
2011-09-06merge changes for storm-1588Oz Linden
2011-09-06merge changes for vwr-26823Oz Linden
2011-09-06LLProxy code review fixes.Logan Dethrow
* 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-02Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-09-02merge changes for .v-pbOz Linden
2011-09-02merge back beta tagsOz Linden
2011-09-02merge changes for storm-1027Oz Linden
2011-09-02correct DOS line endingsOz Linden
2011-09-02re-write the hash table code to eliminate potential flaws and simplify the ↵Xiaohong Bao
implementation.
2011-09-02merged .hgtagsDebi King (Dessie)
2011-09-02Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aaDebi King (Dessie)
2011-09-02increment viewer version to 3.0.5Oz Linden
2011-09-02Added tag 3.0.4-start for changeset 586907287be5Oz Linden
2011-09-02VWR-26823 FIXED Removed DigiNotar CA certificate.Vadim ProductEngine
2011-09-01for SH-2242: fixes the assertion caused by gGL.diffuseColor4f when shadows ↵Xiaohong Bao
is on.
2011-09-01MergeLogan Dethrow
2011-09-01Clarified the reason for adding the deleteSingleton method to LLSingleton. ↵Logan Dethrow
Added a simple unit test to verify the functionality of the deleteSingleton method.
2011-09-01LLProxy start of code review cleanup.Logan Dethrow
2011-09-01Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aaDebi King (Dessie)
2011-08-31EXP-1149 FIX Log in Screen: Replace the new mode selector with the old oneRichard Nelson
improved graphics and layout for logged in mode selector
2011-08-31Automated merge with http://hg.secondlife.com/viewer-developmentRichard Nelson
2011-08-31Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-08-31turn on private memory pool by default.Xiaohong Bao
2011-08-31MergeXiaohong Bao
2011-08-31Point to new Mac version of LLQtWebKit to fix symbol export issue on that ↵callum
platform
2011-08-31storm-1578: change default Away timeout to "never"Oz Linden
2011-08-31update list of translatorsOz Linden
2011-08-31merge changes for storm-1567Oz Linden
2011-08-31merge changes for storm-638Oz Linden
2011-08-31merge changes for storm-1566Oz Linden
2011-08-31merge changes for storm-1572Oz Linden
2011-08-31merge changes for storm-1574Oz Linden