summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-02-18merge max fixes from merov.Andrew A. de Laix
2011-02-18Introduce and use new sendReply() function for LLEventAPI methods.Nat Goodspeed
Each LLEventAPI method that generates a reply needs to extract the name of the reply LLEventPump from the request, typically from a ["reply"] key, copy the ["reqid"] value from request to reply, locate the reply LLEventPump and send the enriched reply object. Encapsulate in sendReply() function before we proliferate doing all that by hand too many more times.
2011-02-18Automated merge up from viewer-development into mesh-developmentLoren Shih
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-17Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010Alain Linden
2011-02-17update to latest apr_suite package.Alain Linden
2011-02-17mergeTofu Buzzard
2011-02-17mergeTofu Buzzard
2011-02-17Automated merge with ↵Nat Goodspeed
http://pdp47.lindenlab.com/cgi-bin/hgwebdir.cgi/brad/viewer-development/
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-17Automated merge with file:///Users/oz/Work/viewer-vs2010Oz Linden
2011-02-17Added an EventAPI listener to LLWindow for hooking into key and mouse inputs.brad kittenbrink
2011-02-17merge up from viewer-autobuildOz Linden
2011-02-17adjust parameters for integration buildOz Linden
2011-02-17mergeDave Parks
2011-02-17SH-1006 Quick pass at cutting down the number of redundant GL calls based on ↵Dave Parks
data from gDEBugger. Reviewed by Nyx.
2011-02-17mergeTofu Buzzard
2011-02-17mergeTofu Buzzard
2011-02-17mergeDave Parks
2011-02-17SH-547 Use appropriate texture channel for rendering avatars into their ↵Dave Parks
impostor map.
2011-02-17Automated merge with file:///Users/oz/Work/V-DROz Linden
2011-02-17mergeTofu Buzzard
2011-02-17mergeTofu Buzzard
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-17catch up with viewer-beta branchEli Linden
2011-02-17Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-02-17SH-959 FIX crash in llflexibleobject.cppNyx (Neal Orman)
Crash was a result of one of two possibilities: 1) trying to update geometry when it wasn't visible 2) mSimulateRes was non-zero when mInitialized was 0 Put code to handle both cases - initialize if mSimulateRes is 0 OR mInitialized is 0 But only do so if the object is visible. If the object is not visible, early out. Code reviewed by davep
2011-02-17merge changes for viewer-autobuildOz Linden
2011-02-17merge lastest changes from viewer-vs2010Oz Linden
2011-02-17mergeprep
2011-02-17Another part of the pelvis fix. Sh-634prep
2011-02-17explicity call python scripts with python so they work on all platforms.Andrew A. de Laix
2011-02-17try disabling parallel builds in TC for LinuxOz Linden
2011-02-17Mesh-development work in progressLoren Shih
2011-02-16STORM-987 : Allow more flexibility around input and output listsMerov 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-16STORM-987 : Implement in and out list of files and pattern matchingMerov Linden
2011-02-16SOCIAL-544 PARTIAL move skylight skin to viewer repoRichard Linden
2011-02-16turn off parallel linux builds; they don't work for autobuild driven builds.Alain Linden
2011-02-16for now, turn off precompiled header usage by default (so Incredibuild will ↵Alain Linden
work).