summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-02-03STORM-316 : pull into viewer-developmentMerov Linden
2011-02-02STORM-953 Clarify what happens when you uncheck Allow Public AccessJonathan Yap
Note: This change also incorporates STORM-960
2011-02-02STORM-960 Descriptive text missing next to first checkbox in About Land/AccessJonathan Yap
Contribution team: Aleric Inglewood, Alexandrea Fride, Robin Cornelius, and Siana Gearz
2011-02-02Merge with viewer-developmentMerov Linden
2011-02-02STORM-435 : pull into viewer-developmentMerov Linden
2011-02-02Pull from viewer-betaMerov Linden
2011-02-02STORM-957 : pull in viewer-beta (da and fr localization)Merov Linden
2011-02-02Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-02fix for Sh-445: debug settings -> "CacheNumberOfRegionsForObjects" does not ↵Xiaohong Bao
limit the number of object cache files
2011-02-01Sync with viewer-developmentMerov Linden
2011-02-01Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-01STORM-484 : pull in viewer-developmentMerov Linden
2011-02-01fix for SH-891: crash at LLDrawable::getFace(int)Xiaohong Bao
2011-02-01CT-635 FIX DA and FR translationEli Linden
2011-02-01mergeDave Parks
2011-02-01Sync with viewer-betaEli Linden
2011-02-01STORM-655 FIXED mismatched filter extension in snapshot floater (jpeg vs jpg)paul_productengine
- Added filter "jpg" for "Save As..." dialog so that *.jpg files can be seen as well as *.jpeg.
2011-02-01merge changes back from beta branchOz Linden
2011-02-01mergeDave Parks
2011-02-01SH-483 Fix for varioius issues with hi-rez snapshots -- mainly disable the ↵Dave Parks
ability to take hi-rez snapshots if UI or HUD attachments are in the snapshot, and go back to old tile compositing method instead of using huge framebuffer objects.
2011-01-31MergeKent Quirk
2011-01-31VWR-22024 -- apply Bao's patch to betaKent Quirk
2011-01-31merge changes for storm-934Oz Linden
2011-01-31STORM-507 FIXED User that has sent p2p call invitation to other user, is not ↵paul_productengine
added to Recent tab - Add the caller to the Recent List just after Incoming Call floater appears. Before recicpient accepted or rejected the call.
2011-01-31pull changes for STORM-940 and CHOP-369Oz Linden
2011-01-31merge changes for storm-845Oz Linden
2011-01-31merge changes for storm-829Oz Linden
2011-01-31merge changes for storm-643Oz Linden
2011-01-31merge changes for storm-351Oz Linden
2011-01-29Automated merge with file:///Users/oz/Work/V-DOz Linden
2011-01-29correct DOS line endingsOz Linden
2011-01-28Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-01-28trivial: remove some debug code.Xiaohong Bao
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-28fixed the major memory leaking for SH-723/SH-847: memoy leakingXiaohong Bao
2011-01-28STORM-937 : Makes all python paths use consistent syntaxMerov Linden
2011-01-28Merge with headcallum
2011-01-28STORM-934 POSSIBLE FIX [crashhunters] crash at [2] ↵callum
LLPanelAvatarProfile::got_full_name_callback(LLUUID const &,std::basic_string,std::allocator > const &,bool) [secondlife-bin llpanelavatar.cpp]
2011-01-28pull back fixes from betaOz Linden
2011-01-28STORM-316 FIXED Added "Sort Folders Always by Name" setting.Seth ProductEngine
Removed unused settings Inventory.Folders by Name/Sort by Date/Sort by Name/System Folders to Top.
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-28STORM-610 FIXED Changes to water color and density in the Environment Editor ↵Vadim ProductEngine
now persist between sessions. However they get overriden when you switch water presets in the Advanced Water floater.
2011-01-27STORM-634 FIX missing Danish translationEli Linden