Aleric Inglewood d23835a6c2 Merge remote-tracking branch 'singu/master' into curlthreading2 ...

Conflicts:
	indra/newview/statemachine/aistatemachine.cpp

Huh - you re-INDENTED a file that you didn't merge yet?
How about merging curlthreading2 and curlthreading3
before doing THAT? :/

Obviously I did an "use ours" here.

2012-09-11 15:15:46 +02:00

..

aicurleasyrequeststatemachine.cpp

Timer, time out, and clean up improvements.

2012-07-14 04:29:37 +02:00

aicurleasyrequeststatemachine.h

Timer, time out, and clean up improvements.

2012-07-14 04:29:37 +02:00

aidirpicker.h

Add AIDirPicker and use it. Remove indra/newview/ll{dir,file}picker.{h,cpp}.

2011-05-11 03:01:34 +02:00

aievent.cpp

Use AIThreadSafeDC and _wat convention to simplify AIEvent.

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

aievent.h

Minor documentation fixes.

2011-08-18 19:30:42 +02:00

aifetchinventoryfolder.cpp

New inventory observer implementation.

2012-01-21 04:54:39 -06:00

aifetchinventoryfolder.h

gAgent.set/getInventoryRootID() changed to gInventory.set/getRootFolderID()

2011-10-12 02:29:12 -05:00

aifilepicker.cpp

AIThreadSafe* update.

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

aifilepicker.h

AIThreadSafe* update.

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

aistatemachine.cpp

Fast timer fix-up

2012-09-10 02:06:07 +02:00

aistatemachine.h

Merge remote-tracking branch 'singu/master' into curlthreading2

2012-09-11 15:15:46 +02:00

aitimer.cpp

Add AITimer and AIPersistentTimer state machines.

2012-02-10 02:10:12 +01:00

aitimer.h

Add an AITimer to AICurlEasyRequestStateMachine.

2012-07-10 05:09:08 +02:00

CMakeLists.txt

Merge remote-tracking branch 'singu/master' into curlthreading2

2012-08-13 17:07:25 +02:00