summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-02-16Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
2011-02-16Automated merge with file:///Users/oz/Work/viewer-autobuildOz Linden
2011-02-16fix dos line endingsOz Linden
2011-02-16for now, turn off precompiled header usage by default (so Incredibuild will ↵Alain Linden
work).
2011-02-16Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
2011-02-16merging in latest viewer-developmentOz Linden
2011-02-16fix for INTEGRATION_TEST_llcapabilitylistener (include Python to run with ↵Alain Linden
correct python executable).
2011-02-16merge changes for storm-981Oz Linden
2011-02-15fix test failure caused by dubious method for testing an empty string.Alain Linden
2011-02-14debug_console is now resizableAndrew Meadows
Reviewed with Callum Linden.
2011-02-14bump version number to 2.7.0Oz Linden
2011-02-11STORM-975 : pull into viewer-developmentMerov Linden
2011-02-11STORM-833 : pull into viewer-developmentMerov Linden
2011-02-11explicitly import ZLIB.Alain Linden
2011-02-10various fixes to get the debug build working; don't look for or copy ↵Alain Linden
msvc*80.dll's.
2011-02-10STORM-986 : Fix for Linux buildMerov Linden
2011-02-10STORM-986 FIX (build error/Linux) media_plugin_webkit errors on some Windows ↵callum
systems
2011-02-09STORM-981 : Fix Linux link issues when LL_TESTS is ONMerov Linden
2011-02-09STORM-986 : pull into viewer-developmentMerov Linden
2011-02-09pull from viewer-developmentMerov Linden
2011-02-10STORM-833 FIXED "i" button overlapping text in name list controls like Group ↵Seth ProductEngine
Members list.
2011-02-09Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-09trivial: remove some redundant code.Xiaohong Bao
2011-02-09Additional fix for llmediaplugintest compilation failure after fix for VWR-21275callum
2011-02-09debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in ↵Xiaohong Bao
LLSurface::getWaterHeight
2011-02-08STORM-601 : pull into viewer-developmentMerov Linden
2011-02-08STORM-433 : pull into viewer-developmentMerov Linden
2011-02-08STORM-507 : pull into viewer-developmentMerov Linden
2011-02-08STORM-953 : pull into viewer-developmentMerov Linden
2011-02-08STORM-955 : pull into viewer-developmentMerov Linden
2011-02-08STORM-960 : pull into viewer-developmentMerov Linden
2011-02-08VWR-21275 FIX // *SOME* Windows systems fail to load the Qt plugins if the ↵callum
current working Reviewed by Richard - http://codereview.lindenlab.com/6011001/
2011-02-08fix a couple more packaging problems...Alain Linden
2011-02-07update pacageing of msvc?100.dll's; use latest qt package with all needed libs.Alain Linden
2011-02-07there is no mt for vs2010Alain Linden
2011-02-06STORM-975 Duplicated menu entry Develop/Ui/Region Debug ConsoleJonathan Yap
2011-02-14merge up to latest viewer-developmentOz Linden
2011-02-11merge up to lastest upstreamOz Linden
2011-02-06merge to latest viewer-developmentOz Linden
2011-02-04STORM-610 : Backing out that change (test fail)Merov Linden
2011-02-04Clean up license headers in a handfull of filesMerov Linden
2011-02-04STORM-655 : Pull into viewer-developmentMerov Linden
2011-02-04STORM-610 : Pull into viewer-developmentMerov Linden
2011-02-04STORM-601 FIXED Color swatch now receives focus on mouse click.Seth ProductEngine
2011-02-04fix linking to llqtwebkit.Alain Linden
2011-02-04STORM-433 FIXED Fixed reshaping notification panel with friendship offer ↵Seth ProductEngine
when it is inserted into IM chat.
2011-02-04STORM-465 FIXED Made all keys localizable.Vadim ProductEngine
Renamed HUD direction strings ("Left", "Right", "Up", "Down") to avoid strings duplication.
2011-02-03STORM-513 : pull into viewer-developmentMerov Linden
2011-02-03STORM-397 : pull into viewer-developmentMerov Linden
2011-02-03STORM-316 : pull into viewer-developmentMerov Linden