summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-06build fixRichard Linden
2011-09-06EXP-1196 FIX Fix param block template orderingRichard Linden
forgot to set menu name in menu.xml reviewed by Leslie
2011-09-06EXP-1196 FIX Fix param block template orderingRichard Linden
changed ordering of template loading relative to constructor setting of params moved a lot of constructor-set params to template files reviewed by Leslie
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-06* Disabling outbox for now.Leslie Linden
2011-09-06EXP-1194 FIX -- Update New tag behavior to update Newness timestamp when ↵Leslie Linden
Received Items panel is open and do not auto open Received Items panel * The inbox no longer auto-expands under any condition. * Changed new-ness timestamp from "LastInventoryInboxCollapse" to "LastInventoryInboxExpansion" to eschew obfuscation. * "LastInventoryInboxExpansion" now saved out when user opens the panel.
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-02sync with viewer-developmenteli
2011-09-02sync with viewer-developmenteli
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-01* Changing inbox item "new" tag to off by default rather than on to eliminateLeslie Linden
false positives.
2011-09-01for SH-2242: fixes the assertion caused by gGL.diffuseColor4f when shadows ↵Xiaohong Bao
is on.
2011-09-01EXP-1001 FIX -- Newness is removed on next login if you log out or crash ↵Leslie Linden
before opening inventory panel EXP-1148 FIX -- New Tags can show in incorrect locations when opening folder with drop down arrow in Received Items panel EXP-1163 FIX -- When ordering a Direct Delivery item in Basic Mode, item is not shown as new on login to Advanced mode EXP-1172 FIX -- New tags not displayed for items delivered while not logged in on next login to viewer EXP-1173 FIX -- New tags are removed for all new items when Inventory side panel is opened * New tag now set when an item folder is added to the inbox. * Update to new tag only happens when a valid date exists. * Inbox collapsed time now only set when inbox panel is in a visible chain.
2011-09-01sync with viewer-developmenteli
2011-09-01mergeBrad Payne (Vir Linden)
2011-09-01Fix for model metricsBrad Payne (Vir Linden)
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-77_3.0.0-release for changeset 1778f26b6d0aDebi King (Dessie)
2011-09-01Removed tag DRTVWR-78_3.0.0-releaseDebi King (Dessie)
2011-09-01Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aaDebi King (Dessie)
2011-09-01SH-2309 WIP Priority modifications to mesh uploader UIPaul ProductEngine
- Bind "Cosine%" param with "Smooth" combo box. - Corrected some wording. - Little UI polish. Line with results in Physics tab. - Changed ordering of LOD combo box items.
2011-08-31Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-08-31fix for SH-2367: Model upload errors are not displayedXiaohong Bao
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-31SH-2314 FIX - change RenderVolumeLODFactor back to 1.125 for low graphicsBrad Payne (Vir Linden)