22bd85441b
Clean up for postcard post.
2015-07-22 09:33:21 -07:00
f2850548ab
Forgot to remove an unused varable and renamed NewFileResourceUploadInfo to LLNewFileResourceUploadInfo
2015-07-20 17:00:06 -07:00
37d17eaebd
Remove old "compile queue" and replace with the coroutine based upload queue.
2015-07-20 15:57:10 -07:00
2fc4ddb92b
Added a couple LL_WARNS to track why upload button disabled.
2015-07-17 15:58:03 -07:00
d22812a8c8
LSL Compile and upload from task object. Fix auto open when finished on all uploads...
2015-07-17 14:32:14 -07:00
9b64867d8b
Merge
2015-07-15 14:40:35 -07:00
1a6a6c786d
LSL Script upload from inventory.
2015-07-15 14:35:53 -07:00
02441157a0
increment viewer version to 3.8.2
2015-07-14 16:59:45 -04:00
18ef351bab
Added tag 3.8.1-release for changeset 3f61ed662347
2015-07-14 16:59:45 -04:00
03c202a475
Remove the dead code.
2015-07-13 12:51:11 -07:00
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
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
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
8e6bea61a9
MAINT-5351: llupdaterservice_test now needs Boost System library.
2015-07-12 10:57:13 -04:00
f1be78f7e2
MAINT-5351: Finish messy merge restoring 'selfless' changes.
2015-07-11 08:06:15 -04:00
d215de3b7d
Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u
2015-07-10 19:46:51 -04:00
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
68f42e4e10
MAINT-5351: Finish cleaning up messy merge from backing out backout
2015-07-10 19:44:47 -04:00
9bde72f784
Automated merge with file:///Users/nat/linden/maint-4952-v-t-u
2015-07-10 19:37:19 -04:00
391d9a367b
Merge restore of more selfless changes
2015-07-10 19:34:20 -04:00
efa9a0f99c
Backed out changeset bab1000e1b2d: restore 'selfless' changes
2015-07-10 19:30:10 -04:00
9809f59fa9
Merge restore of selfless changes
2015-07-10 16:54:05 -04:00
6f9f89ee71
Backed out changeset 6e1fa9518747: reapply 'selfless' changes
2015-07-10 16:47:07 -04:00
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
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
768ef45067
Merge suppress http_proxy in INTEGRATION_TEST_llcorehttp
2015-07-09 21:44:02 -04:00
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
675b6a8074
Fix the sample.
2015-07-08 15:16:54 -07:00
75b12d79e1
Enforcing constness of refs
2015-07-08 14:49:08 -07:00
fed4463cb9
This should be semantically the same thing that was there.
2015-07-08 14:02:12 -07:00
ef3d1d642e
Replace ref parameter with value
2015-07-08 13:41:07 -07:00
7ff38e34ea
Update the unit tests to use the new pointer type.
2015-07-08 12:44:57 -07:00
fe5567639d
Change HttpOptions::ptr_t to be shared_ptr<> rather than intrusive.
2015-07-08 12:09:36 -07:00
1138c57f9a
Convert LLCore::HttpHeaders to use shared_ptr<> rather than an intrusive_ptr<> for refrence counting.
2015-07-08 10:01:27 -07:00
6689c92400
Automated merge with bundle:C:\Users\admin\AppData\Local\Temp\0d1ig3y4.ke0
2015-07-07 11:46:44 -07:00
b34163be5e
Merge
2015-07-07 11:44:15 -07:00
247eb0c9c3
Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5
2015-07-07 19:41:27 +01:00
d8c02a2838
Apply reverse patch
2015-07-07 19:37:01 +01:00
4c1d47d4ae
Backed out selfless merge
2015-07-07 19:31:34 +01:00
5a8580f7cb
Clean up viewrmenufile into viewrassetuplod
2015-07-07 10:09:55 -07:00
33007699cc
Automated merge with ssh://bitbucket.org/nat_linden/viewer-selfless
2015-07-07 09:33:32 -04:00
0b9a641b17
Force Boost use of TR1 for result_of in tests
2015-07-06 15:05:27 -07:00
8487a19df1
Force Boost result_of to use TR1 for tests.
2015-07-06 09:51:05 -07:00
50a97cd15a
Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u
2015-07-04 19:58:43 -04:00
1d2514956f
MAINT-5357: Add llcoro::yield() function to yield for one frame.
2015-07-04 19:58:03 -04:00
99aa00293b
Remove ambiguous assignment.
2015-07-03 09:39:18 -07:00
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
6ccd8bb612
Temp disable llavatarnamecache integration test for linux
2015-07-02 16:54:19 -07:00
d28c7dd7f6
Forgot to set a Transaction ID
2015-07-02 15:02:40 -07:00
f00cd0ab9f
Crash on second add to coproc queue.
2015-07-02 14:39:12 -07:00
Rider Linden