summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-24use our own domain for llhost_test; linux.org changed dns and broke itOz 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-23Automated merge with ssh://hg@bitbucket.org/lindenlab/viewer-developmentOz Linden
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-28 FIXED Added the ability to send agent's own calling card to others.Seth ProductEngine
- Added creating own calling card for the user to be able to share it with other residents. - Moved calling cards synchronization with friends list to the viewer start up. Previously synchronized upon opening the Friends tab in People side panel. - Calling cards for non-friends are not removed upon calling cards synchronization with friends list. - Enabled "Share" menu item for calling cards in inventory.
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-19Do not add <jsonpath>/include/json as an include director. Instead use ↵Nicky
<jsonpath>/include. Otherwise include/json/features.h will mask /usr/include/features.
2011-02-23Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
2011-02-21change host reverse lookup test to use our own host (linux.org failed)Oz Linden
2011-02-19Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010Oz Linden
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-18use improved packaging for jsoncppOz Linden
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-18merge changes for viewer-vs2010Oz Linden
2011-02-18merge mac autobuild fix from MerovOz Linden
2011-02-17Autobuild: fix for Mac build using XCodeMerov Linden
2011-02-17VWR-24917 Use mIsDisplayNameDefault to reduce name redundancy in nearby chat ↵Ardy Lay
history * Clean up changes based upon feedback from reviewers. * Improve comment based upon feedback from reviewers.
2011-02-17merge changes from jenn_linden/viewer-vs2010Oz 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-17merge up from viewer-autobuildOz Linden
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-17merge changes for storm-937Oz Linden
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-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.
2011-02-15STORM-990 Merged from current v-d trying to resolve merge issue Oz was havingJonathan Yap
2011-02-15fix test failure caused by dubious method for testing an empty string.Alain Linden
2011-02-15STORM-954 SL-viewer 2.0 No nearby people when over approxiamately 1000 metersTwisted Laws
2011-02-14debug_console is now resizableAndrew Meadows
Reviewed with Callum Linden.
2011-02-14bump version number to 2.7.0Oz Linden