summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-09-15mergeDebi King (Dessie)
2011-09-12sh-2379: re-enable multi-threaded curl (fixes viewer stall, may re-introduce ↵Oz Linden
some crashes)
2011-09-08Automated merge with ssh://hg@bitbucket.org/lindenlab/viewer-betaDebi King (Dessie)
2011-09-02Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aaDebi King (Dessie)
2011-09-01Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aaDebi King (Dessie)
2011-08-31STORM-1576 FIXED The "Show" button in agent-to-agent inventory offers didn't ↵Vadim ProductEngine
work. Fixed the button index, which became invalid after removing the IOR_BUSY response in the recent fix of STORM-1543 (changeset 526d86e69101).
2011-09-09STORM-1534: fix credits generation on Windows, adjust to new environment ↵Oz Linden
variable convention in build system
2011-09-08SRCH-1623: UNDO EXP--1081Oz Linden
2011-08-29merged .hgtagsDebi King (Dessie)
2011-08-29Added tag DRTVWR-86_3.0.2-beta2, 3.0.2-beta2 for changeset e5c9af2d7980Debi King (Dessie)
2011-08-29Added tag 3.0.3-start for changeset b95ddac176acOz Linden
2011-08-29merge changes for .v-pbOz Linden
2011-08-29merge tags back from viewer-betaOz Linden
2011-08-29merge tags from viewer-releaseOz Linden
2011-08-28merged fix for EXP-1160 (STORM-1575)Debi King (Dessie)
2011-08-28Added tag DRTVWR-83_3.0.2-beta1, 3.0.2-beta1 for changeset 42784bf50fa0Debi King (Dessie)
2011-08-28merged .hgtags from viewer-releaseDebi King (Dessie)
2011-08-28merge from viewer-pre-releaseDebi King (Dessie)
2011-08-28mergeDebi King (Dessie)
2011-08-28Added tag DRTVWR-78_3.0.0-release, 3.0.0-release for changeset 1778f26b6d0aDebi King (Dessie)
2011-08-26disabled basic inventory root creationRichard Nelson
reviewed by Stone
2011-08-26EXP-1160 FIX Cannot drag/drop items from inventory into the contents of a ↵Richard Nelson
prim in latest Mesh build 239475 brought back some old logic for dispatching to child folder as drag and drop fallback
2011-08-26merge changes for storm-1568Oz Linden
2011-08-26merge changes for storm-1543Oz Linden
2011-08-26STORM-1543 WIP Removed invalid IOR_BUSY response option.Vadim ProductEngine
Addressing review feedback.
2011-08-25merge changes for storm-1268Oz Linden
2011-08-25merge changes for storm-1542Oz Linden
2011-08-25merge changes for storm-1276Oz Linden
2011-08-25merge changes for storm-1571Oz Linden
2011-08-25merge changes for storm-1570Oz 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-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-22Fixed a xui widget name mismatch between c++ and xml.Logan Dethrow
2011-08-22merged .hgtagsDebi King (Dessie)
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