Commit Graph

33930 Commits (9b64867d8bc2fa93d0bdb67fa529690348b67611)

Author SHA1 Message Date
Rider Linden 9b64867d8b Merge 2015-07-15 14:40:35 -07:00
Rider Linden 1a6a6c786d LSL Script upload from inventory. 2015-07-15 14:35:53 -07:00
Oz Linden 02441157a0 increment viewer version to 3.8.2 2015-07-14 16:59:45 -04:00
Oz Linden 18ef351bab Added tag 3.8.1-release for changeset 3f61ed662347 2015-07-14 16:59:45 -04:00
Rider Linden 03c202a475 Remove the dead code. 2015-07-13 12:51:11 -07:00
Rider Linden 0ba39810a9 Rename the file in VFS with the new asset AID (prevents crash on gesture change and fixes notecard update) 2015-07-13 12:42:23 -07:00
Nat Goodspeed ec466b2f5e MAINT-5351: glh-linear 'equivalent' macro has been destroyed.
Hopefully we no longer need to brute-force remove any more macros with the
same name.
2015-07-12 14:38:06 -04:00
Nat Goodspeed a75b7a1c4a MAINT-5351: Use new glh-linear package without 'equivalent' macro.
The presence of a macro named 'equivalent' was breaking the compilation of any
source file that #included both glh_linear.h and Boost System.
2015-07-12 14:36:38 -04:00
Nat Goodspeed 8e6bea61a9 MAINT-5351: llupdaterservice_test now needs Boost System library. 2015-07-12 10:57:13 -04:00
Nat Goodspeed f1be78f7e2 MAINT-5351: Finish messy merge restoring 'selfless' changes. 2015-07-11 08:06:15 -04:00
Nat Goodspeed d215de3b7d Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u 2015-07-10 19:46:51 -04:00
Rider Linden 91f636f23a MAINT-5356: Conversion of Notecards and Gesture to use new coroutine uploading.
Minor reorganization of Upload Info classes.
2015-07-10 16:45:07 -07:00
Nat Goodspeed 68f42e4e10 MAINT-5351: Finish cleaning up messy merge from backing out backout 2015-07-10 19:44:47 -04:00
Nat Goodspeed 9bde72f784 Automated merge with file:///Users/nat/linden/maint-4952-v-t-u 2015-07-10 19:37:19 -04:00
Nat Goodspeed 391d9a367b Merge restore of more selfless changes 2015-07-10 19:34:20 -04:00
Nat Goodspeed efa9a0f99c Backed out changeset bab1000e1b2d: restore 'selfless' changes 2015-07-10 19:30:10 -04:00
Nat Goodspeed 9809f59fa9 Merge restore of selfless changes 2015-07-10 16:54:05 -04:00
Nat Goodspeed 6f9f89ee71 Backed out changeset 6e1fa9518747: reapply 'selfless' changes 2015-07-10 16:47:07 -04:00
Nat Goodspeed 0c915913fd MAINT-5351: Improve management of "current" coroutine information.
Our first cut at tracking the "current" coroutine simply reset the pointer to
NULL every time we context-switched away. But that strategy doesn't handle the
case of coroutine A launching coroutine B.
Introduce LLCoros::CoroData to track, among other things, the previous value
of the current-coroutine pointer each time we switch into a coroutine. Restore
THAT value when we switch back out.
2015-07-10 16:01:15 -04:00
Nat Goodspeed fdb9a50d4b MAINT-4952: correct name of LLViewerRegionImpl::requestBaseCapabilitiesCoro.
The string name being passed to LLCoros didn't match.
2015-07-10 11:39:49 -04:00
Nat Goodspeed 768ef45067 Merge suppress http_proxy in INTEGRATION_TEST_llcorehttp 2015-07-09 21:44:02 -04:00
Nat Goodspeed 657944cda7 Suppress http_proxy env var for llcorehttp integration test.
Sometimes it can be useful to have http_proxy set in the environment, but if
we leave it set while INTEGRATION_TEST_llcorehttp is running, the test hangs.
Suppress that variable for that integration test.
2015-07-09 21:42:34 -04:00
Rider Linden 675b6a8074 Fix the sample. 2015-07-08 15:16:54 -07:00
Rider Linden 75b12d79e1 Enforcing constness of refs 2015-07-08 14:49:08 -07:00
Rider Linden fed4463cb9 This should be semantically the same thing that was there. 2015-07-08 14:02:12 -07:00
Rider Linden ef3d1d642e Replace ref parameter with value 2015-07-08 13:41:07 -07:00
Rider Linden 7ff38e34ea Update the unit tests to use the new pointer type. 2015-07-08 12:44:57 -07:00
Rider Linden fe5567639d Change HttpOptions::ptr_t to be shared_ptr<> rather than intrusive. 2015-07-08 12:09:36 -07:00
Rider Linden 1138c57f9a Convert LLCore::HttpHeaders to use shared_ptr<> rather than an intrusive_ptr<> for refrence counting. 2015-07-08 10:01:27 -07:00
Rider Linden 6689c92400 Automated merge with bundle:C:\Users\admin\AppData\Local\Temp\0d1ig3y4.ke0 2015-07-07 11:46:44 -07:00
Rider Linden b34163be5e Merge 2015-07-07 11:44:15 -07:00
Rider Linden 247eb0c9c3 Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5 2015-07-07 19:41:27 +01:00
Rider Linden d8c02a2838 Apply reverse patch 2015-07-07 19:37:01 +01:00
Rider Linden 4c1d47d4ae Backed out selfless merge 2015-07-07 19:31:34 +01:00
Rider Linden 5a8580f7cb Clean up viewrmenufile into viewrassetuplod 2015-07-07 10:09:55 -07:00
Nat Goodspeed 33007699cc Automated merge with ssh://bitbucket.org/nat_linden/viewer-selfless 2015-07-07 09:33:32 -04:00
Rider Linden 0b9a641b17 Force Boost use of TR1 for result_of in tests 2015-07-06 15:05:27 -07:00
Rider Linden 8487a19df1 Force Boost result_of to use TR1 for tests. 2015-07-06 09:51:05 -07:00
Nat Goodspeed 50a97cd15a Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u 2015-07-04 19:58:43 -04:00
Nat Goodspeed 1d2514956f MAINT-5357: Add llcoro::yield() function to yield for one frame. 2015-07-04 19:58:03 -04:00
rider 99aa00293b Remove ambiguous assignment. 2015-07-03 09:39:18 -07:00
Nat Goodspeed d34476359e MAINT-5357: Extract LLErrorEvent to global namespace.
This exception class got inadvertently swept up into the llcoro namespace. Its
LLClassConvention name is intended for use in the global namespace. As there
are no current references, this is a trivial change.
2015-07-03 09:57:02 -04:00
Rider Linden 6ccd8bb612 Temp disable llavatarnamecache integration test for linux 2015-07-02 16:54:19 -07:00
Rider Linden d28c7dd7f6 Forgot to set a Transaction ID 2015-07-02 15:02:40 -07:00
Rider Linden f00cd0ab9f Crash on second add to coproc queue. 2015-07-02 14:39:12 -07:00
Nat Goodspeed f90023fc0b MAINT-5357: Introduce and populate llcoro:: namespace.
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-02 17:00:32 -04:00
Rider Linden d785ec312b Merge 2015-07-02 09:22:05 -07:00
Rider Linden f8a7eda55b Adjusting uploadinfo object for expansion.
Commit is prelim to allow merge from selfless.
2015-07-02 09:17:48 -07:00
Nat Goodspeed 2a29dbc482 MAINT-5351: Reorder llmessage test libraries to make Linux happy.
Both BOOST_CONTEXT_LIBRARY and BOOST_COROUTINE_LIBRARY were mentioned. But as
BOOST_COROUTINE_LIBRARY depends on BOOST_CONTEXT_LIBRARY, they must be
mentioned in that order for Linux to successfully link the test programs.
2015-07-01 19:23:08 -04:00
Nat Goodspeed 7eaee4fde7 MAINT-5351: Reorganize lleventcoro_test.cpp to be more readable.
Each test<n>() method invokes a function from earlier in the source. It's much
better if each of those functions immediately precedes the test that invokes it.
2015-07-01 19:14:24 -04:00