summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-08-24mergeBrad Payne (Vir Linden)
2011-08-24Re-add 3 llinstancetracker tests disabled by changeset 1ead63777bf6.Nat Goodspeed
Fix LLInstanceTracker::key_iter constructor param; accepting InstanceMap::iterator by non-const reference relied on Microsoft extension that accepts non-const reference to an rvalue. Given typical iterator implementation, simply accept by value instead, which makes gcc happy too.
2011-08-24SH-2309 WIP Priority modifications to mesh uploader UIPaul ProductEngine
- Arranged all controls of the floater (according to the last version of the mockup) except for the tab container content.
2011-08-23Respect --no-verify-ssl-cert option.Aaron Stone
2011-08-23mergeLogan Dethrow
2011-08-23Fixed LLProxy UI constraints. Fixed some XUI warnings in the Proxy Settings ↵Logan Dethrow
Floater.
2011-08-23SH-2169 ADDITIONAL FIX Fixed SLURL showing context-specific help for object ↵Seth ProductEngine
weights floater.
2011-08-22Fixed a xui widget name mismatch between c++ and xml.Logan Dethrow
2011-08-22merged .hgtagsDebi King (Dessie)
2011-08-22SH-2171 ADDITIONAL FIX Added transaction ID to object weights requests to ↵Seth ProductEngine
avoid updating the floater upon outdated or mixed up replies arrival.
2011-08-22mergeBrad Payne (Vir Linden)
2011-08-22SH-2169 FIXED Land impacts data added to build tools floater.Seth ProductEngine
Land selection moved from advanced weights floater to build tools floater. Removed selection observer from weights floater, selection data update in it is initiated from build floater.
2011-08-22merge changes for open-107Oz Linden
2011-08-22increment viewer version to 3.0.3Oz Linden
2011-08-22Added tag 3.0.2-start for changeset f2412ecd6740Oz Linden
2011-08-22adjust build parameters for Snowstorm team buildsOz Linden
2011-08-22STORM-1542 FIXED Changed search URL back from search-beta to search.sl.com.Vadim ProductEngine
2011-08-22STORM-1543 WIP More cleanup and comments.Vadim ProductEngine
2011-08-22merge changes for storm-1554Oz Linden
2011-08-20mergeDave Parks
2011-08-20MergeDave Parks
2011-08-20update BuildParams for Snowstorm Team buildsOz Linden
2011-08-20merge changes for .v-rOz Linden
2011-08-20merge back release tagsOz Linden
2011-08-20merge back beta tagsOz Linden
2011-08-20merge changes for storm-1562Oz Linden
2011-08-20merge changes for storm-1041Oz Linden
2011-08-20merge changes for storm-793Oz Linden
2011-08-20merge changes for storm-782Oz Linden
2011-08-20merge changes for storm-1565Oz Linden
2011-08-19open-107: upgrade to complete stub for convex decompositionOz Linden
2011-08-19BUILDFIX fixing unix line endings on two files to pass policy checks.Nyx (Neal Orman)
2011-08-19merging in latest mesh-developmentNyx (Neal Orman)
2011-08-19FIX SH-862 SH-1246 SH-1565 SH-1566 Update render cost algorithmNyx (Neal Orman)
render cost algorithm triangle count is now scaled to be more balanced vs texture/particle count. In addition added factors for light-emitting and media texture primitives. Algorithm should be near "final" at this point.
2011-08-19merge changes for storm-1563Oz Linden
2011-08-19merge changes for storm-1564Oz Linden
2011-08-19correct coding policy problemsOz Linden
2011-08-19mergeDave Parks
2011-08-19mergeDave Parks
2011-08-19fix for SH-1498: crash at LLImageGL::deleteDeadTextures() line 1429Xiaohong Bao
2011-08-19Added tag DRTVWR-81_3.0.1-beta1, 3.0.1-beta1 for changeset 364fd63517fbDebi King (Dessie)
2011-08-19Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-08-19STORM-1543 WIP Minor cleanup.Vadim ProductEngine
2011-08-19STORM-1543 WIP Fixed auto-moving offered inventory items to trash.Vadim ProductEngine
It turned out impossible to properly remove an inventory item from within LLDiscardAgentOffer::done(), because that would lead to nested LLInventoryModel::notifyObservers() calls. Fixed that by deferring removal until the next LLAppViewer::idle() iteration. Also elimiteed duplicated code.
2011-08-19STORM-1543 WIP Fixed dropping nventory offers in busy mode.Vadim ProductEngine
When auto-discarding inventory offers we looked up missing Busy button (i.e. a button having index=3) in the inventory offer notification dialog template. Failure to find the button resulted in ignoring inventory offers. Fixed that by "auto-clicking" the existing Discard button.
2011-08-19SH-2309 WIP Priority modifications to mesh uploader UIPaul ProductEngine
- Swapped left and right sides of the floater
2011-08-19SH-2285 FIXED Add localization capability to mesh uploader stringsPaul ProductEngine
- Added ability to translate "Preview" and "Normal" strings.
2011-08-19mergeBrad Payne (Vir Linden)
2011-08-19STORM-1268 Settings for ignorable dialogs were reset during deferred ↵Vadim ProductEngine
auto-upgrade. Reason: In case of deferred upgrade (i.e. when you select "Later...") the defaults for notifications settings are not loaded, so when the viewer exits after launching the updater, it incorrectly re-saves notifications settings. Fix: Initialize settings earlier, so that viewer picks them up in update mode.
2011-08-18WIP INTL-46 Update translation for Traditional Chineseeli