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

..

cmake

Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

2012-03-28 22:27:45 +02:00

copy_win_scripts

…

cwdebug

WIP: Make curl thread code robust and flexible.

2012-06-28 01:30:46 +02:00

lib/python

El crappo. Failed to include this file in earlier commit.

2012-01-28 21:37:19 -06:00

libopenjpeg

Remove compiler warning 'cast from pointer to integer of different size'.

2012-01-22 01:50:25 +01:00

linux_crash_logger

Attempt to fix linking on newer linux

2011-12-23 18:31:47 +01:00

llaudio

Fixup of LLAtomic and LLThreadSafeRefCount

2012-06-27 04:27:07 +02:00

llcharacter

Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

2012-06-18 21:09:16 -04:00

llcommon

WIP: Make curl thread code robust and flexible.

2012-06-28 01:30:46 +02:00

llcrashlogger

Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights

2012-01-09 05:40:03 -05:00

llimage

AIThreadSafe* update.

2012-06-27 04:27:07 +02:00

llimagej2coj

In hindsight, not letting OpenJPEG to error out nicely was a bad idea.

2012-03-28 00:26:56 +02:00

llinventory

Trival V3 llmath merge.

2012-05-21 20:23:42 -05:00

llmath

STORM-1870 and Have a space before old names in parentheses, like V3.

2012-06-09 17:07:20 -04:00

llmessage

WIP: Make curl thread code robust and flexible.

2012-06-28 01:30:46 +02:00

llplugin

Print useful error when dlopen() return NULL on linux standalone.

2012-06-27 04:27:08 +02:00

llprimitive

Updated client tagging system. Client tags only looked up in opensim, and most logic pulled out into its own singleton.

2012-05-30 19:14:11 -05:00

llrender

Merge branch 'master' into V2MultiWear

2012-06-27 04:26:44 +02:00

llui

Fixed up Keywords

2012-06-24 01:52:56 -04:00

llvfs

Few more GCC 4.7 fixes.

2012-04-29 00:25:40 -04:00

llwindow

Correct path to launch_url.sh

2012-06-10 09:09:27 -04:00

llxml

Minor llxmlnode updated. Tracks line numbers and ostream format is a bit nicer.

2012-06-15 09:52:35 -05:00

llxuixml

Fixed compile errors for gcc4.7 (also reported by clang)

2012-04-28 21:29:52 -04:00

lscript

Updated lscript, a bit, to match upstream.

2012-06-19 16:16:39 -04:00

mac_crash_logger

…

mac_updater

…

newview

WIP: Make curl thread code robust and flexible.

2012-06-28 01:30:46 +02:00

plugins

Few more GCC 4.7 fixes.

2012-04-29 00:25:40 -04:00

test

Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights

2012-01-09 05:40:03 -05:00

test_apps/llplugintest

…

tools/vstool

…

win_crash_logger

…

win_updater

…

CMakeLists.txt

Added LLInitParam. Not yet plugged into xml parsing.

2012-02-24 20:16:33 -06:00

develop.py

Removed the first configure command description and aligned the first two commands with the last two so it looks prettier.

2012-01-13 23:55:49 -05:00