summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2015-07-07Automated merge with bundle:C:\Users\admin\AppData\Local\Temp\0d1ig3y4.ke0Rider Linden
2015-07-07MergeRider Linden
2015-07-07Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5Rider Linden
2015-07-07Backed out selfless mergeRider Linden
2015-07-07Clean up viewrmenufile into viewrassetuplodRider Linden
2015-07-04Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-uNat Goodspeed
2015-07-03Remove ambiguous assignment.rider
2015-07-02Temp disable llavatarnamecache integration test for linuxRider Linden
2015-07-02Forgot to set a Transaction IDRider Linden
2015-07-02Crash on second add to coproc queue.Rider Linden
2015-07-02MAINT-5357: Introduce and populate llcoro:: namespace.Nat Goodspeed
To date, the coroutine helper functions in lleventcoro.h have been in the global namespace. Migrate them into llcoro namespace, and fix references. Specifically, LLVoidListener => llcoro::VoidListener, and voidlistener(), postAndWait(), both waitForEventOn(), postAndWait2(), errorException() and errorLog() have been moved into llcoro. Also migrate new LLCoros::get_self() and Suspending to llcoro:: namespace. While at it, I realized that -- having converted several lleventcoro.h functions from templates (for arbitrary 'self' parameter type) to ordinary functions, having moved them from lleventcoro.h to lleventcoro.cpp, we can now migrate their helpers from lleventcoro.h to lleventcoro.cpp as well. This eliminates the need for the LLEventDetail namespace; the relevant helpers are now in an anonymous namespace in the .cpp file: listenerNameForCoro(), storeToLLSDPath(), WaitForEventOnHelper and wfeoh().
2015-07-02MergeRider Linden
2015-07-02Adjusting uploadinfo object for expansion.Rider Linden
Commit is prelim to allow merge from selfless.
2015-07-01MAINT-5351: Remove 'self' parameter from coroutine functions.Nat Goodspeed
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest builds clean, but the resulting viewer is as yet untested.
2015-07-01Added header for httpclient to llpanelexperiencepicker.Rider Linden
(Will be removed when converted to coroutines)
2015-07-01MergeRider Linden
2015-07-01MAINT-4952: fix NewResourceUploadInfo member initialization list.Nat Goodspeed
2015-06-30MergeRider Linden
2015-06-30Initial checkin for uploading via coroutine.Rider Linden
2015-06-30increment viewer version to 3.8.1Oz Linden
2015-06-29MAINT-5200: Correct new LLCore::HttpHeaders::ptr_t usage.Nat Goodspeed
The convention about how to construct an HttpHeaders::ptr_t has changed. Change new code to adapt to merged changes.
2015-06-29Automated merge with ssh://bitbucket.org/rider_linden/MAINT-4952-v-t-uNat Goodspeed
2015-06-29MAINT-4952: Use IntrusivePtr for BufferArray,HttpHeaders,HttpOptions.Nat Goodspeed
Specifically, change the ptr_t typedefs for these LLCore classes to use IntrusivePtr rather than directly using boost::intrusive_ptr. This allows us to use a simple ptr_t(raw ptr) constructor rather than having to remember to code ptr_t(raw ptr, false) everywhere. In fact, the latter form is now invalid: remove the now-extraneous 'false' constructor parameters.
2015-06-29MAINT-5200: Add DebugSlshareLogTag temp setting for developers.Nat Goodspeed
This allows engaging slshare-service debug logging for a particular viewer session without having to twiddle the slshare-service hosts. Also fix leaky LLCore::HttpHeaders::ptr_t construction.
2015-06-29Automated merge with ssh://bitbucket.org/rider_linden/MAINT-4952-v-t-uNat Goodspeed
2015-06-23Code review results with NatRider Linden
2015-06-23Start work on coprocedure manager.Rider Linden
2015-06-18MAINT-5200: Add debug headers to Facebook slshare-service calls.Nat Goodspeed
2015-06-17Distressing. A variable got autocorrected to 'false' but the compiler ↵Rider Linden
didn't catch it.
2015-06-17https://jira.secondlife.com/browse/MAINT-5283Rider Linden
The default behavior in the HTTP layer changed to follow redirects automatically. This was causing a problem with connecting to the SL share service which was attempting to riderect to the login page at the CURL level. Connections to SL Share will no longer redirect, corrected for Facebook, Flickr and Twitter.
2015-06-17Coding policy fixesRider Linden
2015-06-16MergeRider Linden
2015-06-15increment viewer version to 3.7.31Oz Linden
2015-06-12Merge fix for MAINT-5277 into experience tools branchsimon
2015-06-12MAINT-5277 FIXED Viewer is missing MSVCP100.DLL and MSVCR100.DLLAndreyL ProductEngine
2015-06-09Removed dead code, llsdmessage, llcapabilitylistener and the associated tests.Rider Linden
2015-06-09Removed homelocation responder (rolled into llagent)Rider Linden
Removed sdhandler from llagent. Removed unused values from llacountingccostmgr Fixed smart pontier creation in llfacebook
2015-06-08Added a way to pass a policy Id to the coroadapter.Rider Linden
Changed language, appearance, and maturity to conform to use the adapter rather than the SDHandler
2015-06-08make a lot of values agree with declared typesOz Linden
2015-06-08remove false positive trigraphsOz Linden
2015-06-08corrections needed for new toolsOz Linden
2015-06-08merge changes for 3.7.29-releaseOz Linden
2015-06-08MergeRider Linden
2015-06-05Added a seek method to LLCore::Http for data rewind.Rider Linden
A couple of minor changes to merchant out box in hopes that the would fix the issues.
2015-06-04Default headers added.Rider Linden
Group manager finished conversion. Outfit folders coverted.
2015-06-04IM session decline using coroutines.Rider Linden
2015-06-04Fix broken web profile posting.Rider Linden
2015-06-03Was a little too agressive in header removal in two places.Rider Linden
2015-06-03Remove vestigial httpclient.h include from files that no longer need it.Rider Linden
2015-06-03Land Media URL entry to coroutine.Rider Linden