Latif Khalifa 8584e6da4c Merge branch 'master' into meshupload ...

Conflicts:
	indra/llcommon/llhash.h
	indra/newview/CMakeLists.txt
	indra/newview/llfloatermodelpreview.cpp
	indra/newview/llfloatermodelpreview.h
	indra/newview/llpanelprofile.h

2013-01-30 00:36:31 +01: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

Merge branch 'master' into meshupload

2013-01-21 19:16:06 +01:00

aifilepicker.h

Renamed FFLOAD/SAVE_LSL to FFLOAD/SAVE_SCRIPT

2013-01-07 20:11:18 +01:00

CMakeLists.txt

Clear up a few issues revealed upon forced full recompile. (VS is dumb sometimes)

2012-12-22 23:44:43 -06:00