summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-02-01Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-02-01STORM-484 : pull in viewer-developmentMerov Linden
2011-02-01fix a minor memory leaking flaw for SH-895: some mild memory leaking (partially)Xiaohong Bao
2011-02-01fix for SH-891: crash at LLDrawable::getFace(int)Xiaohong Bao
2011-02-01Fix string-init compile error (g++ 4.4) in llurlentry_stub.cpp.Nat Goodspeed
Newer C++ compilers produce a (fatal) warning when you try to initialize a (non-const) char* variable with a string literal: you're supposed to capture such data in a const char*. But as this module is resolving external references declared in ancient message-system headers, we don't have the option to fix the original declaration. Instead use char* _PREHASH_Foo = const_cast<char*>("string literal"); // sigh
2011-02-01CT-635 FIX DA and FR translationEli Linden
2011-02-01mergeDave Parks
2011-02-01Replace ad-hoc test functions/methods with systematic enumeration.Nat Goodspeed
Previous tests involved a small handful of functions with only a couple different parameter types. Now we exhaustively invoke every registration case, plus every metadata query case. Call cases still pending.
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-31Fix crash bug in array-style metadata query for nullary functions.Nat Goodspeed
The shortcut way to construct an LLSD array of size n is to assign LLSD() to array[n-1]. That's fine -- as long as you remember not to do it for n == 0.
2011-01-31MergeKent Quirk
2011-01-31VWR-22024 -- apply Bao's patch to betaKent Quirk
2011-01-31Resolve LLEventDispatcher::add(function(const LLSD&)) ambiguity.Nat Goodspeed
A free function or static method accepting(const LLSD&) was being intercepted by the free-function-with-arbitrary-parameters overload instead of the original Callable overload. Added an overload that specifically redirects that case. Documented limit of ~6 arbitrary parameters for directly-called functions (5 for methods). Beyond that many, you have to write a Callable wrapper function and unpack the parameters from the LLSD by hand.
2011-01-31Fix a couple gotchas in LLSDArray, LLSDParam, llsd_equals().Nat Goodspeed
Nested LLSDArray expressions, e.g.: LLSD array_of_arrays(LLSDArray(LLSDArray(17)(34)) (LLSDArray("x")("y"))); would quietly produce bad results because the outermost LLSDArray was being constructed with the compiler's implicit LLSDArray(const LLSDArray&) rather than LLSDArray(const LLSD&) as the reader assumes. Fixed with an explicit copy constructor to Do The Right Thing. Generalized LLSDParam<float> specialization into a macro to resolve similar conversion ambiguities for float, LLUUID, LLDate, LLURI and LLSD::Binary. Added optional bits= argument to llsd_equals() to permit comparing embedded Real values using is_approx_equal_fraction() rather than strictly bitwise. Omitting bits= retains current bitwise-comparison behavior.
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-28Introduce LLSDArray, LLSDMap, LLSDParam.Nat Goodspeed
LLSDArray is a helper to construct an LLSD::Array value inline. LLSDMap is a helper to construct an LLSD::Map value inline. LLSDParam is a customization point, a way for generic code to support unforseen parameter types as conversion targets for LLSD values.
2011-01-28fixed the major memory leaking for SH-723/SH-847: memoy leakingXiaohong Bao
2011-01-28trivial: convert to "unix return"Xiaohong 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-27Fix annoying GCC 4.4 warning for implicite char * castKyle Ambroff
2011-01-27STORM-634 FIX missing Danish translationEli Linden
2011-01-27STORM-940: use the tip, not the dialog.Andrew A. de Laix