Aleric Inglewood 536cb6febd Merge branch 'curlthreading2' into curlthreading3 ...

Conflicts:
	indra/CMakeLists.txt
	indra/llcommon/llstring.h
	indra/llmessage/CMakeLists.txt
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp
	indra/newview/llappviewer.cpp

2012-08-15 00:51:40 +02:00

..

GL

Global lineending fixup

2012-01-14 05:42:53 +01:00

glh

First set of changes for new librarys and lib layout support!

2012-07-04 00:26:42 +00:00

CMakeLists.txt

Cleanup of some unnecessary dependencies.

2012-07-29 01:30:11 +02:00

lldragdropwin32.cpp

LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.

2011-08-29 03:44:17 -05:00

lldragdropwin32.h

LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.

2011-08-29 03:44:17 -05:00

lldxhardware.cpp

Put in some changes along sg1.4 dev history.

2010-11-21 15:57:44 +01:00

lldxhardware.h

Imported existing code

2010-04-02 02:48:44 -03:00

llkeyboard.cpp

LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.

2011-08-29 03:44:17 -05:00

llkeyboard.h

Imported existing code

2010-04-02 02:48:44 -03:00

llkeyboardheadless.cpp

LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.

2011-08-29 03:44:17 -05:00

llkeyboardheadless.h

LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.

2011-08-29 03:44:17 -05:00

llkeyboardmacosx.cpp

LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.

2011-08-29 03:44:17 -05:00

llkeyboardmacosx.h

Imported existing code

2010-04-02 02:48:44 -03:00

llkeyboardsdl.cpp

LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.

2011-08-29 03:44:17 -05:00

llkeyboardsdl.h

Imported existing code

2010-04-02 02:48:44 -03:00

llkeyboardwin32.cpp

LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.

2011-08-29 03:44:17 -05:00

llkeyboardwin32.h

Imported existing code

2010-04-02 02:48:44 -03:00

llmousehandler.cpp

Merge with siana/future

2011-10-13 00:03:56 -05:00

llmousehandler.h

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

llpreeditor.h

LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.

2011-08-29 03:44:17 -05:00

llwindow.cpp

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

llwindow.h

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

llwindowcallbacks.cpp

Trival V3 llmath merge.

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

llwindowcallbacks.h

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

llwindowheadless.cpp

LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.

2011-08-29 03:44:17 -05:00

llwindowheadless.h

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

llwindowmacosx-objc.h

Imported existing code

2010-04-02 02:48:44 -03:00

llwindowmacosx-objc.mm

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

llwindowmacosx.cpp

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

llwindowmacosx.h

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

llwindowmesaheadless.cpp

LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.

2011-08-29 03:44:17 -05:00

llwindowmesaheadless.h

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

llwindowsdl.cpp

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

llwindowsdl.h

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

llwindowwin32.cpp

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

llwindowwin32.h

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00