summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-01-28Merge with nat/viewer-eventapi2Don Kjer
2011-01-28Merge from viewer-developmentDon Kjer
2011-01-28Extend LLEventAPI to directly call other functions & methods.Nat Goodspeed
Until now, LLEventAPI has only been able to register functions specifically accepting(const LLSD&). Typically you add a wrapper method to your LLEventAPI subclass, register that, have it extract desired params from the incoming LLSD and then call the actual function of interest. With help from Alain, added new LLEventAPI::add() methods capable of registering functions/methods with arbitrary parameter signatures. The code uses boost::fusion magic to implicitly match incoming LLSD arguments to the function's formal parameter list, bypassing the need for an explicit helper method. New add() methods caused an ambiguity with a previous convenience overload. Removed that overload and fixed the one existing usage. Replaced LLEventDispatcher::get() with try_call() -- it's no longer easy to return a Callable for caller to call directly. But the one known use of that feature simply used it to avoid fatal LL_ERRS on unknown function-name string, hence the try_call() approach actually addresses that case more directly. Added indra/common/lleventdispatcher_test.cpp to exercise new functionality.
2011-01-28pull back fixes from betaOz Linden
2011-01-28merge fixes for SOCIAL-452 and STORM-927Oz Linden
2011-01-28Mergecallum
2011-01-28SOCIAL-452 FIX Default size of Web content floater is wrong - needs to be ↵callum
optimized for Web profile display
2011-01-28STORM-927 - FIX - [VWR-24426] SSL Handshake Failed Error when accessing ↵callum
web-based content on development viewers using recent Webkit 4.7 Also removed refs to debug vars used to specify location of pem file
2011-01-28merge changes for storm-634Oz Linden
2011-01-28merge changes for social-473Oz Linden
2011-01-27STORM-634 FIX missing Danish translationEli Linden
2011-01-27merge changes for storm-348Oz Linden
2011-01-27merge changes for storm-843Oz Linden
2011-01-27merge changes for storm-547Oz Linden
2011-01-27merge changes for storm-373Oz Linden
2011-01-25correct build errorVadim ProductEngine
2011-01-25Backed out changeset b3a24f496b23Don Kjer
2011-01-24SOCIAL-473 FIX Add Kick, Freeze, Unfreeze and CSR to profile mini floater ↵Richard Linden
drop down Added Kick and CSR, made existing Freeze menu item use god mode freeze when in god mode (works across grid, not just with local avatars)
2011-01-24Exposing estate_id in new instant message for viewer use. Part of ER-393Don Kjer
2011-01-24Added new notifications for ER-393 and ER-394Don Kjer
2011-01-25STORM-843 FIXED incremental inventory search to use more restrictive or less ↵Seth ProductEngine
restrictive filtering. Stored filter sub-string comparison with new string failed because of non-matching register of compared strings. Transforming the new search term to uppercase before comparing it with previous one allows to determine if filter became more or less restrictive and not to restart the search over. Used patch provided by Satomi Ahn.
2011-01-25Fixed TestCapabilityProvider build issue.Seth ProductEngine
2011-01-24Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-01-24fix for SH-445: debug settings -> "CacheNumberOfRegionsForObjects" does not ↵Xiaohong Bao
limit the number of object cache files
2011-01-24merge changes for beta fixesOz Linden
2011-01-24merge changes for i18n fixesOz Linden
2011-01-24VWR-24321: fix validation of textures that start with 00Aleric Inglewood
2011-01-21INTL-20,CT-635 WIP DE,FR,ES,PT,PL translation (new files) for Viewer 2.5Eli Linden
2011-01-21INTL-20,CT-635 WIP DE,FR,ES,PT,PL translation for Viewer 2.5Eli Linden
2011-01-21MergeXiaohong Bao
2011-01-21Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: ↵Xiaohong Bao
Viewer attempting to load precached images in file types that are not being used.)
2011-01-21VWR-24519: make debugging easier by not spawning spare processAleric Inglewood
2011-01-21VWR-24354: correct manifest dependencies to prevent parallel install problemAleric Inglewood
2011-01-21merge changes for storm-844Oz Linden
2011-01-21merge changes for storm-869Oz Linden
2011-01-21merge changes for storm-874/ER-428: fix lost movement updates when walkingOz Linden
2011-01-21merge changes for storm-715Oz Linden
2011-01-21merge changes for storm-832Oz Linden
2011-01-21merge changes for storm-834Oz Linden
2011-01-21merge changes for storm-484Oz Linden
2011-01-21merge changes for storm-383Oz Linden
2011-01-20merge changes from viewer-betaOz Linden
2011-01-20fix for SH-829: Viewer attempting to load precached images in file types ↵Xiaohong Bao
that are not being used.
2011-01-20VWR-24320: remove dump of call stack on clean exitAleric Inglewood
2011-01-20VWR-24317: remove warning re: RenderCubeMap by deferring initializationAleric Inglewood
2011-01-20merge changes for chop-366Oz Linden
2011-01-20VWR-24426: fix SSL handshake error using webkit 4.7Kent Quirk
2011-01-20VWR-24317: remove warning caused by reading the last line of the ↵Aleric Inglewood
featuretable twice
2011-01-20VWR-24317: remove warnings for deleting non-existant texture file on startupAleric Inglewood
2011-01-20VWR-24317: clean up incorrect warnings prior to login in log fileAleric Inglewood