summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-03-03merge from lindenlab/viewer-developmentAlain Linden
2011-03-02VWR-24992 FIX remove evil old parameters in localized xml fileseli_linden
2011-03-02VWR-24754 FIX from Torben Troutmaneli_linden
2011-03-02revert to old jsoncpp library on linux to fix build.Andrew de Laix
2011-03-02VWR-23494 FIX on behalf of Torban Troutmaneli_linden
2011-03-01add openal include path for openal dependent build.Alain Linden
2011-03-01Set the version to 2.5.1... Yeap! Back from 2.7.0 (not a misprint)Merov Linden
2011-03-01Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010Alain Linden
2011-03-01fixes to get openal working on windows.Alain Linden
2011-03-01STORM-1004 : pull into viewer-developmentMerov Linden
2011-03-01fix some mac build problems with library name changes with new packaages.Andrew A. de Laix
2011-03-01STORM-954 : pull into viewer-developmentMerov Linden
2011-03-01STORM-949 : pull into viewer-developmentMerov Linden
2011-03-01STORM-889 : pull into viewer-developmentMerov Linden
2011-03-01STORM-842 : pull into viewer-developmentMerov Linden
2011-03-01STORM-665 : pull into viewer-developmentMerov Linden
2011-03-01STORM-1024 : pull into viewer-developmentMerov Linden
2011-03-01STORM-977 : pull into viewer-developmentMerov Linden
2011-02-28Take out symbol generation for slplugin.exe since this step currently fails, ↵Jennifer Leech
need to debug, but don't want it to be a blocker. This is expected to get TeamCity runs passing on Windows.
2011-02-25STORM-980 : pull into viewer-developmentMerov Linden
2011-02-25STORM-974 : pull into viewer-developmentMerov Linden
2011-02-25STORM-680 : pull into viewer-developmentMerov Linden
2011-02-25STORM-979 : pull into viewer-developmentMerov Linden
2011-02-25Fix llhost integration test: replaced linux.org by lindenlab.com in the DNS ↵Merov Linden
lookup test as linux.org was not being resolved as expected
2011-02-24Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010Jennifer Leech
2011-02-24Merged changes from bitbucket.org/squire_linden/viewer-vs2010Jennifer Leech
2011-02-24integrate xmlrpc-epi into windows build.Alain Linden
2011-02-24STOMR-665 FIXED User is not able to view full name of Group's founder in the ↵Paul ProductEngine
Group Profile - Made text box and its panel follow right
2011-02-23separate vertex buffer and index buffer when map/unmap VBO. can be treated ↵Xiaohong Bao
as part of STORM-1011. reviewed by davep.
2011-02-22update vstool to support vs2010.Alain Linden
2011-02-22Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-22set "RenderVBOMappingDisable" to be true by default to stop VBO memory leaking.Xiaohong Bao
2011-02-22more fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused ↵Xiaohong Bao
leaking.
2011-02-22STORM-889 FIXED Put Link/Unlink in Edit PanelPaul ProductEngine
- Moved callbacks for Link/Unlink to the LLSelectMgr - Binded Link/Unlink callbacks with buttons in Build Floater - Replaced view_listener_t usage for Link, Unlink, EnableLink, EnableUnlink with boost::bind
2011-02-21Changes windows build and PNG cmake to reflect latests libpng buildssquire
2011-02-18Fix for failure to link Release builds due to :Release being an invalid path ↵brad kittenbrink
name on windows.
2011-02-18Fix for packaging failure. Installer was missing the SecondLife.exe binarybrad kittenbrink
due to improperly disabled msvcrt manifest checking. reviewed by jenn.
2011-02-18merge max fixes from merov.Andrew A. de Laix
2011-02-18BUG STORM-1004 FIXED Unblocking/blocking name sometimes deletes identically ↵paul_productengine
named entry, but of different TYPE LLMuteList stores muted objects in two sets: set of names and set of ids. Avatar objects are stored by ids (set of ids), other objects can be stored both by name(set of names) or ids - Delete items from corresponding set (from set of names or ids), not form both sets at time. - Improved isMuted method's logic. Now if avatar is tested whether it's muted or not, don't search its name in the set of names.
2011-02-17Autobuild: fix for Mac build using XCodeMerov Linden
2011-02-17Ported over mani's patch for handling finding of the RO appdata dir when ↵brad kittenbrink
running from the debugger. ported from changeset https://hg.lindenlab.com/alain/indra-common/changeset/99a9d1876e83/ reviewed by Richard.
2011-02-17STORM-842 FIXED displaying favorites list at login screen when user name is ↵Seth ProductEngine
typed like "firstname.lastname" or "firstname_lastname" or user name consists of a single word.
2011-02-17merge changes for storm-937Oz Linden
2011-02-17Cherrypick Merov's fix for update_version_files.py.Christian Goetze (CG)
2011-02-16for now, turn off precompiled header usage by default (so Incredibuild will ↵Alain Linden
work).
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-16STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has ↵Jonathan Yap
been used
2011-02-15Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-15partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused ↵Xiaohong Bao
leaking.