summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-09-13SH-2353 FIX selection streaming cost always says 0.0Nyx (Neal Orman)
PE found that the streaming cost function definition wasn't lining up with its inherited function definition. Fixed the inhereted funciton definition to add the new parameter. Selection streaming cost works again, though client-side generated. Should probably depricate/remove this feature.
2011-09-13SH-1601 SH-1958 FIX large objects cannot always be selected/modifiedNyx (Neal Orman)
The selection distance limit was set at 64m. Now that we have 64 meter prims this means that you can see objects that you couldn't reliably select, or couldn't always scale up to full scale. Doubled the limit to 128, and selecting and scaling operations appear to work fine, even for 64m objects.
2011-09-13Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-09-13mergeNyx (Neal Orman)
2011-09-13SH-2420 FIX update labeling in about land floaterNyx (Neal Orman)
About land was still referring to the capacity of land in terms of "prims" The new terminology refers to this as land capacity, so that we can get away from the "prim equivalent" terms, as they are confusing.
2011-09-13SH-2400 FIXED crash on model upload.Seth ProductEngine
Added checks for LoD strings array index bounds.
2011-09-13mergeBrad Payne (Vir Linden)
2011-09-12BUILDFIX GCC fixing unused variableNyx (Neal Orman)
2011-09-09merge changes for storm-1590Oz Linden
2011-09-08mergeprep
2011-09-08Fix for SH-2210prep
2011-09-08Automated merge with https://bitbucket.org/paul_productengine/sh-2309Seth ProductEngine
2011-09-08SH-2309 FIXED 'Triangles limit' combo value updating problem.Seth ProductEngine
Fixed updating 'Error threshold' spinner control visibility.
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-07SH-2371 FIXED "Not allowed to upload message" flashes when uploader dialog ↵Paul ProductEngine
comes up - This is a regression bug caused by changeset:20407
2011-09-07Merge mesh-development with sh-2309Paul ProductEngine
2011-09-07Merge from seth_mesh_dev to paul_mesh_devPaul ProductEngine
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-06SH-2309 New icons added to mesh upload floater.Seth ProductEngine
2011-09-06mergeBrad Payne (Vir Linden)
2011-09-06SH-2309 FIXED Priority modifications to mesh uploader UIPaul ProductEngine
- Replaced magic number with constant - Commented my magic numbers
2011-09-05SH-2347 FIXED selecting the value in Stitching Type drop down.Seth ProductEngine
2011-09-05mergeSeth ProductEngine
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-02SH-2171 Commented-out code cleanup.Seth ProductEngine
2011-09-02SH-2309 WIP Label colors changed in mesh upload floater.Seth ProductEngine
2011-09-02SH-2309 Model preview floater LoD tab updated.Seth ProductEngine
- Combo boxes for LoD source added for each level - New option "Use LoD above" added for copying the model from higher LoDs. - Various LoD settings and related controls removed.
2011-09-02merged .hgtagsDebi King (Dessie)
2011-09-02SH-2309 WIP Priority modifications to mesh uploader UIPaul ProductEngine
- Changed representation of Retain% control values - Added "Choose one..." item to the LOD combo_box
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-01mergeBrad Payne (Vir Linden)
2011-09-01Fix for model metricsBrad Payne (Vir Linden)