Siana Gearz
c1c04b489c
Revert "Possible fix for "No able to connect to SecondLife""
...
This reverts commit 66c95af093 .
2012-07-15 02:29:00 +02:00
Aleric Inglewood
66c95af093
Possible fix for "No able to connect to SecondLife"
2012-07-14 20:57:55 +02:00
Aleric Inglewood
7416d2aaf1
Timer, time out, and clean up improvements.
2012-07-14 04:29:37 +02:00
Aleric Inglewood
0419f8bee9
Add an AITimer to AICurlEasyRequestStateMachine.
...
Fixes AIStateMachine to work thread-safe with the timer.
2012-07-10 05:09:08 +02:00
Aleric Inglewood
f46d8e8a10
Try to be smart about not printing garbage (binary) received from the server.
2012-07-05 23:50:03 +02:00
Aleric Inglewood
df20f918ba
New libcwd channel 'curlio'.
...
Enable printing of libcurl 'IO' debug messages when libcwd channel
'curlio' is turned on (added to .libcwdrc). Avoiding a recompile.
2012-07-05 03:10:16 +02:00
Aleric Inglewood
ae9dadb5d8
Improved layout of curl stats print out.
2012-07-04 16:56:33 +02:00
Aleric Inglewood
14276b3cf8
Bug fix
2012-07-04 08:44:22 +02:00
Aleric Inglewood
07e7eeedd1
Added some windows code.
...
Iterating directly over the elements of fd_set::fd_array in
windows is faster than using FD_ISSET.
2012-07-04 07:32:24 +02:00
Drake Arconis
7af331c50d
First set of changes for new librarys and lib layout support!
...
Modified repackage script to support new layout
Fixed webkit to work against new llqtwebkit
2012-07-04 00:26:42 +00:00
Aleric Inglewood
125a10bb44
Code hardening, review, bug fixes, documentation, curl stats and cleanup.
...
Bug fixes:
AICurlEasyRequestStateMachine didn't delete itself.
curl_multi_socket_action calls were made for potentional removed sockets.
The curl thread wasn't terminated.
2012-07-04 00:10:43 +02:00
Drake Arconis
8eb319d3ba
Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers
2012-07-02 21:08:04 +00:00
Drake Arconis
ece9dda7b4
Initial support for the Clang compiler and numerous warning fixes
2012-07-02 19:45:41 +00:00
Aleric Inglewood
cb5efad026
Turn llassert[_always] into a (single) statement and print line nr in decimal.
2012-06-30 21:14:18 +02:00
Aleric Inglewood
26922a1578
Merge remote-tracking branch 'lirusaito/curlthreading2' into curlthreading2
2012-06-29 05:28:58 +02:00
Aleric Inglewood
90493b6571
Add support for libopenSSL older than version 1.0.0.
2012-06-29 05:20:24 +02:00
Aleric Inglewood
2dee921cd5
Fix libcurl version check.
2012-06-29 01:33:38 +02:00
Lirusaito
433c7c3f99
Spelling fixes and stuff like that to AICurl* and llproxy.* documentations
...
Also removes a duplicate include from llares.cpp
Conflicts:
indra/llmessage/aicurl.cpp
2012-06-28 04:08:25 -04:00
Aleric Inglewood
1f56645b69
Always set proxy settings for every HTTP curl connection.
...
Move applyProxySettings to CurlEasyRequest and call it from
applyDefaultOptions.
Use AIThreadSafe for LLProxy for a more robust threadsafeness.
(This forces correct locking, checks that the unshared vars
are indeed unshared and made it easy to use read/write locking,
which might be important in this case (we do a lot of read-only
accesses to it).
2012-06-28 05:56:21 +02:00
Aleric Inglewood
69ca6cd5b2
WIP: Make curl thread code robust and flexible.
...
Conflicts:
indra/llmessage/llcurl.cpp
indra/llmessage/llcurl.h
indra/newview/app_settings/settings.xml
indra/newview/llappviewer.cpp
indra/newview/llmeshrepository.cpp
Resolved:
indra/llmessage/llcurl.cpp:
Basically removed (not used anyway)
indra/llmessage/llcurl.h:
Basically removed (just includes aiculr.h now)
indra/newview/app_settings/settings.xml:
CurlUseMultipleThreads was remvoved.
CurlMaximumNumberOfHandles and CurlRequestTimeOut
are still in there, but unused at the moment.
indra/newview/llappviewer.cpp:
CurlMaximumNumberOfHandles and CurlRequestTimeOut
are unused at the moment.
indra/newview/llmeshrepository.cpp:
Lock mSignal always (is unlocked inside wait()).
Use mSignal lock to see if we are waiting; remove mWaiting.
Return false from the MeshFetch functions iff we have to retry
a HTTP fetch. Catch the error exception thrown by getByteRange
instead of using it's return value (always returns true
anyway).
2012-06-28 01:30:46 +02:00
Aleric Inglewood
3c2f0b551f
Remove old and never used LLHTTPAssetStorage
2012-06-27 04:27:07 +02:00
Lirusaito
a82953d0d0
Few more GCC 4.7 fixes.
...
include unistd when not on windows.
2012-04-29 00:25:40 -04:00
Lirusaito
8e6063e7b9
Fixed compile errors for gcc4.7 (also reported by clang)
2012-04-28 21:29:52 -04:00
Shyotl
b49ad1cd34
RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater.
2012-04-12 10:29:45 -05:00
Siana Gearz
70438fa06f
Catching up with Lindies part 3
2012-03-26 15:01:53 +02:00
Siana Gearz
1e9e7d701d
fix for SH-2941: crash at LLCurl::Easy::~Easy() (Bao Linden)
2012-03-21 21:31:42 +01:00
Siana Gearz
21170e1e18
Fix build on Windows
2012-03-12 00:35:47 +01:00
Siana Gearz
1db7221508
And of course i forgot to add some files
2012-03-06 09:11:36 +01:00
Siana Gearz
8b6f462d13
Wholesale update of llmessage to V3.2
...
Note that this removes message logger for now.
2012-03-06 07:31:15 +01:00
Aleric Inglewood
787e03e821
LLViewerRegion WIP: Sync indra/llmessage/llregionflags.h with V3
...
It seems a few flags disappeared; adjusted the code accordingly.
Should do the same as V3 now.
2012-02-18 02:22:49 +01:00
Aleric Inglewood
b8744b9e6a
LLViewerRegion WIP: Added all headers that are dragged in.
...
Most in particular llevents.h, which comes along with
the demand that the old events in llevent.h are put
in a namespace LLOldEvents. Made all changes necessary
to compile the rest of the code again (without changing
the actual code: it's still using the old events).
This patch also removes LLStopWhenHandled and LLStandardSignal
from indra/llui/llnotifications.h because those are
moved to llevents.h. That seems to be the only change
to indra/llui/llnotifications.h that isn't floater related,
so I left the rest of that file alone.
2012-02-18 02:22:49 +01:00
Shyotl
9453c2c2e9
Memory tracking system updated.
2012-01-29 01:33:14 -06:00
Shyotl
6c921ba340
Routine V3 merge.
2012-01-29 01:25:39 -06:00
Siana Gearz
d385de9139
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llstartup.cpp
indra/newview/llviewerregion.cpp
2012-01-24 21:22:49 +01:00
Shyotl
6374f012de
new fasttimers, including ui.
2012-01-23 18:30:54 -06:00
Siana Gearz
20ab55752d
Remove megaregion support
2012-01-14 06:46:16 +01:00
Siana Gearz
419f7b41af
Global lineending fixup
2012-01-14 05:42:53 +01:00
Lirusaito
61beedd3d9
Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights
...
Most were needed, though some were just for possible problems with highlighting, should not affect performance whatsoever.
2012-01-09 05:40:03 -05:00
unknown
bdc95a1544
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
2011-10-19 16:09:24 -04:00
Siana Gearz
c9e40f666d
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
...
Conflicts:
indra/llmessage/message_prehash.cpp
indra/llmessage/message_prehash.h
2011-10-14 02:44:20 +02:00
TighMacFanatic
ff786ad2c7
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
2011-10-13 18:16:40 -04:00
Shyotl
7bbbfd9a9b
Added avatar visibility and sound settings to 'About Land' floater.
2011-10-13 03:22:50 -05:00
Shyotl
008bebd817
Merge with siana/future
2011-10-13 00:03:56 -05:00
Siana Gearz
afc91b76b0
Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future
2011-10-09 02:03:08 +02:00
Shyotl
42938abf9b
Static VFS now supported for gAssetStorage lookup.
2011-10-08 02:59:47 -05:00
Siana Gearz
df7f37d0eb
Add a bunch of fixes to the world and minimap so that teleports inside a var work and the map looks semi-correct.
...
Conflicts:
indra/newview/app_settings/message_template.msg
2011-10-06 03:56:05 +02:00
Shyotl
30a95e7f45
Some cleanup. Using gAgentAvatarp in many places. Incl other misc small changes.
2011-10-03 22:45:13 -05:00
Shyotl
c621cb7719
Curl had some structures moved to the header. Also had an extra mutex added for locking multihandle. Includes MISC #include order cleanup.
2011-09-22 23:59:44 -05:00
Shyotl
244e30297f
AIAPRPool, AIAPRRootPool, AIVolatileAPRPool, AIThreadLocalData etc, were rebranded by LL. Merging change to clean up diffs.
2011-09-20 22:08:48 -05:00
Shyotl
36600462d1
Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing
...
Conflicts:
indra/newview/hippopanelgrids.cpp
indra/newview/llstartup.cpp
indra/newview/llsurface.cpp
indra/newview/llviewermessage.cpp
indra/newview/llviewerparceloverlay.cpp
indra/newview/llviewertexturelist.cpp
indra/newview/llworld.cpp
2011-09-09 16:53:12 -05:00